Merge lp:~fboucault/ubuntu-ui-toolkit/remove_relayout_workaround into lp:ubuntu-ui-toolkit/staging

Proposed by Florian Boucault on 2014-08-07
Status: Merged
Approved by: Zoltan Balogh on 2014-08-20
Approved revision: 1185
Merged at revision: 1199
Proposed branch: lp:~fboucault/ubuntu-ui-toolkit/remove_relayout_workaround
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 41 lines (+0/-23)
2 files modified
examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml (+0/-11)
modules/Ubuntu/Components/Label.qml (+0/-12)
To merge this branch: bzr merge lp:~fboucault/ubuntu-ui-toolkit/remove_relayout_workaround
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2014-08-20
Zoltan Balogh (community) 2014-08-07 Approve on 2014-08-20
Review via email: mp+229918@code.launchpad.net

Commit message

Removed workaround that forced relayout when layout mirroring was enabled since bug was fixed in Qt.

To post a comment you must log in.
1185. By Florian Boucault on 2014-08-20

Merged from staging.

Zoltan Balogh (bzoltan) wrote :

OK

review: Approve
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1184
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/853/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3839
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2952
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/685
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/685
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/685/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/685
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3698
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5086
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5086/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11815
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2398
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3236
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3236/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/853/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml'
2--- examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml 2014-04-23 09:39:11 +0000
3+++ examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml 2014-08-20 14:43:42 +0000
4@@ -45,16 +45,5 @@
5 anchors.leftMargin: units.gu(2)
6 anchors.right: parent.right
7 spacing: units.gu(2)
8-
9- /* FIXME: workaround for QTBUG 35095 where Row's content is not relaidout
10- when the width changes and LayoutMirroring is enabled.
11-
12- Ref.: https://bugreports.qt-project.org/browse/QTBUG-35095
13- */
14- onWidthChanged: if (LayoutMirroring.enabled) forceRelayout()
15-
16- function forceRelayout() {
17- spacing = spacing + 0.00001;
18- }
19 }
20 }
21
22=== modified file 'modules/Ubuntu/Components/Label.qml'
23--- modules/Ubuntu/Components/Label.qml 2014-06-16 15:56:59 +0000
24+++ modules/Ubuntu/Components/Label.qml 2014-08-20 14:43:42 +0000
25@@ -56,16 +56,4 @@
26
27 font.pixelSize: FontUtils.sizeToPixels(fontSize)
28 color: Theme.palette.selected.backgroundText
29-
30- /* FIXME: workaround for QTBUG 35095 where Text's alignment is incorrect
31- when the width changes and LayoutMirroring is enabled.
32-
33- Ref.: https://bugreports.qt-project.org/browse/QTBUG-35095
34- */
35- /*! \internal */
36- onWidthChanged: if (LayoutMirroring.enabled) {
37- // force a relayout
38- lineHeight += 0.00001;
39- lineHeight -= 0.00001;
40- }
41 }

Subscribers

People subscribed via source and target branches