Merge lp:~zsombi/ubuntu-ui-toolkit/fixAplHickupQt56 into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Fix AdaptivePageLayout behavior on Qt5.6

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2120
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/fixAplHickupQt56/+merge/306255/+edit-commit-message

https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1226/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6675/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1226/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2120
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/fixAplHickupQt56/+merge/306255/+edit-commit-message

https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1260/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6676/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1260/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2120
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/fixAplHickupQt56/+merge/306255/+edit-commit-message

https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/40/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6677/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/40/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2120
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/fixAplHickupQt56/+merge/306255/+edit-commit-message

https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1476/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6678/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1476/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2120
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/fixAplHickupQt56/+merge/306255/+edit-commit-message

https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1469/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6679/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1469/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:2120
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/fixAplHickupQt56/+merge/306255/+edit-commit-message

https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/788/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1469
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1469/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1476
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1260
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1226
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/40
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6680/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6679
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6678
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6676
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6675
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6677

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/788/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Please back out the unrelated UbuntuListView changes.

review: Needs Fixing

[lp:~zsombi/ubuntu-ui-toolkit/fixAplHickupQt56]

2121. By Zsombor Egri on 2016-09-22

roll back UbuntuListView changes

2122. By Zsombor Egri on 2016-09-22

staging sync

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1245/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6786/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1245/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1279/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6787/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1279/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/59/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6788/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/59/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1495/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6789/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1495/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1488/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6790/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1488/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/799/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1488
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1488/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1495
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1279
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1245
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/59
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6791/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6790
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6789
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6787
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6786
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6788

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/799/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

> Please back out the unrelated UbuntuListView changes.

Done

[Cris Dywan (kalikiana)]

Thanks!!! Although the prevPrimaryPageSource check is a little annoying, the code is sensible and the handling of the default metrics is actually nicer.

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1246/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6792/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1246/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1280/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6793/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1280/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/60/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6794/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/60/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1496/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6795/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1496/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2122
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1489/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6796/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1489/rebuild

review: Approve (continuous-integration)

=== modified file 'src/imports/Components/1.3/AdaptivePageLayout.qml'
--- src/imports/Components/1.3/AdaptivePageLayout.qml	2016-06-22 20:13:56 +0000
+++ src/imports/Components/1.3/AdaptivePageLayout.qml	2016-09-22 17:42:40 +0000
@@ -372,6 +372,18 @@
             d.relayout();
         }
         if (primaryPageSource) {
+            /*
+              From Qt5.6 onwards, the change signal for a var type property (see
+              bug https://bugreports.qt.io/browse/QTBUG-42255) comes after the
+              component completion, due to elements being processed in parallel
+              by the compiler. This causes the page to be created twice for the
+              primaryPage, which ends up in failure for the second time that causes
+              the primaryPage to be set to null. Thus no other page can be added
+              afterwards.
+              */
+            if (d.prevPrimaryPageSource === undefined) {
+                d.prevPrimaryPageSource = primaryPageSource;
+            }
             d.createPrimaryPage(primaryPageSource);
         } else if (primaryPage) {
             d.createPrimaryPage(primaryPage);
@@ -392,11 +404,20 @@
         }
     }
     onPrimaryPageSourceChanged: {
-        if (!d.completed || d.internalUpdate) {
-            return;
-        }
+        if (!d.completed) {
+            return;
+        }
+        if (d.internalUpdate) {
+            d.prevPrimaryPageSource = primaryPageSource;
+            return;
+        }
+        if (d.prevPrimaryPageSource === primaryPageSource) {
+            return;
+        }
+
         // remove all pages first
         d.purgeLayout();
+        d.prevPrimaryPageSource = primaryPageSource;
         // create the new primary page if a valid component is specified
         if (primaryPageSource) {
             d.createPrimaryPage(primaryPageSource);
@@ -428,6 +449,7 @@
         property PageColumnsLayout activeLayout: null
         property list<PageColumnsLayout> prevLayouts
         property Page prevPrimaryPage
+        property var prevPrimaryPageSource
 
         /*! internal */
         onColumnsChanged: {
@@ -438,7 +460,7 @@
             d.relayout();
         }
         property real defaultColumnWidth: units.gu(40)
-        onDefaultColumnWidthChanged: body.applyMetrics()
+        onDefaultColumnWidthChanged: body.updateHeaderHeight(0)
 
         function internalPropertyUpdate(propertyName, value) {
             internalUpdate = true;
@@ -685,15 +707,6 @@
     }
 
 
-    // default metrics
-    Component {
-        id: defaultMetrics
-        PageColumn {
-            fillWidth: __column == d.columns
-            minimumWidth: d.defaultColumnWidth
-        }
-    }
-
     // An instance will be added to each Page with
     Component {
         id: backActionComponent
@@ -738,10 +751,20 @@
             id: holder
             active: false
             objectName: "ColumnHolder" + column
-            property var pageWrapper: pageWrapperComponent.createObject()
+            property PageWrapper pageWrapper: PageWrapper{}
+
             property int column
             property alias config: subHeader.config
-            property PageColumn metrics: getDefaultMetrics()
+            property PageColumn metrics: (d.activeLayout && d.activeLayout.data[column])
+                                         ? d.activeLayout.data[column]
+                                         : defaultMetrics
+
+            PageColumn {
+                id: defaultMetrics
+                fillWidth: (holder.column + 1) == d.columns
+                minimumWidth: d.defaultColumnWidth
+            }
+
             readonly property real dividerThickness: units.dp(1)
             readonly property alias hiddenPool: hiddenItem
 
@@ -939,12 +962,6 @@
                 wrapper.pageHolder = null;
                 return wrapper;
             }
-
-            function getDefaultMetrics() {
-                var result = defaultMetrics.createObject(holder);
-                result.__column = Qt.binding(function() { return holder.column + 1; });
-                return result;
-            }
         }
     }
 
@@ -1012,20 +1029,7 @@
             for (var i = 0; i < children.length; i++) {
                 children[i].column = i;
             }
-            applyMetrics();
-        }
-
-        function applyMetrics() {
-            for (var i = 0; i < children.length; i++) {
-                var holder = children[i];
-                // search for the column metrics
-                var metrics = d.activeLayout ? d.activeLayout.data[i] : null;
-                if (!metrics) {
-                    metrics = holder.getDefaultMetrics();
-                }
-                holder.metrics = metrics;
-                updateHeaderHeight(0);
-            }
+            updateHeaderHeight(0);
         }
     }
 }

=== modified file 'tests/unit/visual/tst_adaptivepagelayout_configuration.13.qml'
--- tests/unit/visual/tst_adaptivepagelayout_configuration.13.qml	2016-06-15 13:46:51 +0000
+++ tests/unit/visual/tst_adaptivepagelayout_configuration.13.qml	2016-09-22 17:42:40 +0000
@@ -112,7 +112,7 @@
 
         Page {
             id: page1
-            title: "Page1"
+            header: PageHeader { title: "Page1" }
 
             Column {
                 anchors.centerIn: parent
@@ -129,15 +129,15 @@
         }
         Page {
             id: page2
-            title: "Page2"
+            header: PageHeader { title: "Page2" }
         }
         Page {
             id: page3
-            title: "Page3"
+            header: PageHeader { title: "Page3" }
         }
         Page {
             id: page4
-            title: "Page4"
+            header: PageHeader { title: "Page4" }
         }
     }