Merge lp:~daker/ubuntu-ui-toolkit/fix.1341559 into lp:ubuntu-ui-toolkit/staging
| Status: | Merged |
|---|---|
| Approved by: | Christian Dywan on 2017-02-21 |
| Approved revision: | 2177 |
| Merged at revision: | 2175 |
| Proposed branch: | lp:~daker/ubuntu-ui-toolkit/fix.1341559 |
| Merge into: | lp:ubuntu-ui-toolkit/staging |
| Diff against target: |
50 lines (+16/-0) 3 files modified
components.api (+1/-0) src/imports/Components/1.3/OptionSelector.qml (+6/-0) tests/unit/visual/tst_optionselector.13.qml (+9/-0) |
| To merge this branch: | bzr merge lp:~daker/ubuntu-ui-toolkit/fix.1341559 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | Approve on 2017-02-21 | |
| Christian Dywan | 2017-02-17 | Approve on 2017-02-21 | |
|
Review via email:
|
|||
Commit Message
Add count prop to OptionSelector
Description of the Change
Add count prop to OptionSelector
FAILED: Continuous integration, rev:2174
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2174
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2174
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2174
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2174
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
- 2175. By Adnane Belmadiaf on 2017-02-20
-
Fix components.api
- 2176. By Adnane Belmadiaf on 2017-02-20
-
Add test for the OptionSelector count prop
FAILED: Continuous integration, rev:2176
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2176
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2176
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2176
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2176
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
| Christian Dywan (kalikiana) wrote : | # |
@@ -731,6 +731,7 @@ Ubuntu.
Ubuntu.
property bool colourImage
property double containerHeight
+ readonly property int count
property bool currentlyExpanded
property Component delegate
property bool expanded
@@ -740,7 +741,6 @@ Ubuntu.
property var model
property bool multiSelection
property int selectedIndex
- readonly property int count
Ubuntu.
property color assetColour
property bool colourImage
Differences in API. Did you forget to update components.api?
- 2177. By Adnane Belmadiaf on 2017-02-21
-
Fix components.api
PASSED: Continuous integration, rev:2177
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2177
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2177
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2177
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2177
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2177
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2177
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2177
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
PASSED: Continuous integration, rev:2177
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
Can we have a unit test in tests/unit/