Merge lp:~zeller-benjamin/ubuntu-ui-toolkit/fix-lp1535241 into lp:ubuntu-ui-toolkit/staging

[Benjamin Zeller]

Fix Bug lp:1535241 "AdaptivePageLayout first example is badly broken"

Fix Bug lp:1535241 "AdaptivePageLayout first example is badly broken"

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

PASSED: Continuous integration, rev:1806
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/69/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/167/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:1806
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/71/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/168/console

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

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

It's better but not enough, primaryPage is not respected: the wrong page is displayed

review: Needs Fixing

[Florian Boucault (fboucault)]

> It's better but not enough, primaryPage is not respected: the wrong page is
> displayed

Bad testing

review: Approve

[Tim Peeters (tpeeters)]

Looks good. Thanks for fixing and for adding the unit test.

review: Approve

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

PASSED: Continuous integration, rev:1806
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/87/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/200/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:1806
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/85/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/201/console

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

review: Approve (continuous-integration)

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-01-13 15:57:53 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-01-18 17:17:58 +0000
@@ -892,10 +892,11 @@
     /*! \internal */
     // Pages declared as children will be placed directly into hiddenPages
     default property alias data: hiddenPages.data
-    Item {
+    PageTreeNode {
         id: hiddenPages
         objectName: "HiddenPagePool"
         visible: false
+        active: false
         // make sure nothing is shown eventually
         clip: true
         anchors.fill: parent

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-12-17 13:00:10 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-01-18 17:17:58 +0000
@@ -140,7 +140,6 @@
 void UCAbstractButtonPrivate::_q_mouseAreaClicked()
 {
     // required by the deprecated ListItem module
-    Q_Q(UCAbstractButton);
     if (!acceptEvents) {
         return;
     }

=== modified file 'tests/unit_x11/tst_components/tst_adaptivepagelayout.qml'
--- tests/unit_x11/tst_components/tst_adaptivepagelayout.qml	2015-10-02 05:22:25 +0000
+++ tests/unit_x11/tst_components/tst_adaptivepagelayout.qml	2016-01-18 17:17:58 +0000
@@ -160,6 +160,9 @@
             compare(defaults.primaryPageSource, undefined, "primaryPageSource not set by default");
             compare(defaults.layouts.length, 0, "no layouts by default");
             compare(defaults.columns, columns, columns + " column(s) as default");
+
+            verify(page1.active, "Page1 is not active but should be! Bug(1535241)");
+            verify(!page2.active, "Page2 is active but should not be! Bug(1535241)");
         }
 
         function test_change_primaryPage() {