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

[Florian Boucault]

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1184
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/746/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3200/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2513/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/578/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/578/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/578/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4445/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2784/console

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

review: Needs Fixing (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/remove_relayout_workaround]

1185. By Florian Boucault on 2014-08-20

Merged from staging.

[Zoltan Balogh (bzoltan)]

OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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)

=== modified file 'examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml'
--- examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml	2014-04-23 09:39:11 +0000
+++ examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml	2014-08-20 14:43:42 +0000
@@ -45,16 +45,5 @@
         anchors.leftMargin: units.gu(2)
         anchors.right: parent.right
         spacing: units.gu(2)
-
-        /* FIXME: workaround for QTBUG 35095 where Row's content is not relaidout
-           when the width changes and LayoutMirroring is enabled.
-
-           Ref.: https://bugreports.qt-project.org/browse/QTBUG-35095
-        */
-        onWidthChanged: if (LayoutMirroring.enabled) forceRelayout()
-
-        function forceRelayout() {
-            spacing = spacing + 0.00001;
-        }
     }
 }

=== modified file 'modules/Ubuntu/Components/Label.qml'
--- modules/Ubuntu/Components/Label.qml	2014-06-16 15:56:59 +0000
+++ modules/Ubuntu/Components/Label.qml	2014-08-20 14:43:42 +0000
@@ -56,16 +56,4 @@
 
     font.pixelSize: FontUtils.sizeToPixels(fontSize)
     color: Theme.palette.selected.backgroundText
-
-    /* FIXME: workaround for QTBUG 35095 where Text's alignment is incorrect
-       when the width changes and LayoutMirroring is enabled.
-
-       Ref.: https://bugreports.qt-project.org/browse/QTBUG-35095
-    */
-    /*! \internal */
-    onWidthChanged: if (LayoutMirroring.enabled) {
-                        // force a relayout
-                        lineHeight += 0.00001;
-                        lineHeight -= 0.00001;
-                    }
 }