Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/listitem-base-default-property into lp:ubuntu-ui-toolkit/staging

  1. listitem-base-default-property
  2. Merge into staging
Proposed by Zsombor Egri
Status: Merged
Approved by: Tim Peeters
Approved revision: 1075
Merged at revision: 1085
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/listitem-base-default-property
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 25 lines (+2/-2)
2 files modified
components.api (+1/-1)
modules/Ubuntu/Components/ListItems/Base.qml (+1/-1)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/listitem-base-default-property
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Tim Peeters Approve
Review via email: mp+221080@code.launchpad.net

Commit message

Missing "default" keyword added to children property of Base, causing rendering and test case failures on Qt 5.3.

To post a comment you must log in.
lp:~zsombi/ubuntu-ui-toolkit/listitem-base-default-property updated
1075. By Zsombor Egri

reverted objectName

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1074
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/293/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/495
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/443
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/125
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/125/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/941
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/963
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/963/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/390
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/581
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/581/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/293/rebuild

review: Approve (continuous-integration)
Revision history for this message
Tim Peeters (tpeeters) wrote :

seems good, obviously this was the intention anyway.

We need to verify that no apps break before landing it.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1075
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/295/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/446
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/127
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/127/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/947
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/972
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/972/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/584
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/584/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/295/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components.api'
2--- components.api 2014-05-26 11:36:53 +0000
3+++ components.api 2014-05-27 12:42:00 +0000
4@@ -94,7 +94,7 @@
5 property real __leftIconMargin
6 property real __rightIconMargin
7 property bool __iconIsItem
8- property internal children
9+ default property internal children
10 Caption 0.1 1.0
11 Item
12 property string text
13
14=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
15--- modules/Ubuntu/Components/ListItems/Base.qml 2014-04-28 19:24:56 +0000
16+++ modules/Ubuntu/Components/ListItems/Base.qml 2014-05-27 12:42:00 +0000
17@@ -159,7 +159,7 @@
18 /*!
19 \internal
20 */
21- property alias children: middle.data
22+ default property alias children: middle.data
23 Item {
24 id: middle
25 property bool anchorToIconHelper: !__iconIsItem && iconHelper.source != ""

Subscribers

People subscribed via source and target branches