Merge lp:~tpeeters/ubuntu-ui-toolkit/fixDoubleLine into lp:ubuntu-ui-toolkit/staging

[Tim Peeters]

Hide AppHeader when using AdaptivePageLayout. Fixes bug 1531871.

[lp:~tpeeters/ubuntu-ui-toolkit/fixDoubleLine]

1799. By Tim Peeters on 2016-01-07

fix pagestack unit test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1799
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2701/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1427
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1427/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1423

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

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

I can confirm that fix the address book problem.

review: Approve

[Zsombor Egri (zsombi)]

Nice thanks!

review: Approve

=== modified file 'src/Ubuntu/Components/1.3/MainView.qml'
--- src/Ubuntu/Components/1.3/MainView.qml	2016-01-06 11:24:54 +0000
+++ src/Ubuntu/Components/1.3/MainView.qml	2016-01-07 14:55:46 +0000
@@ -162,7 +162,8 @@
             // don't show the application header if the page has its own header.
             visible: !(internal.activePage &&
                        internal.activePage.hasOwnProperty("header") &&
-                       internal.activePage.header)
+                       internal.activePage.header) &&
+                     internal.activePage
 
             height: visible ? implicitHeight : 0
 

=== modified file 'tests/unit_x11/tst_components/tst_pagestack.qml'
--- tests/unit_x11/tst_components/tst_pagestack.qml	2015-10-21 19:33:28 +0000
+++ tests/unit_x11/tst_components/tst_pagestack.qml	2016-01-07 14:55:46 +0000
@@ -54,9 +54,15 @@
         id: tabs
         Tab {
             id: tab1
+            page: Page {
+                title: "Tab 1"
+            }
         }
         Tab {
             id: tab2
+            page: Page {
+                title: "Tab 2"
+            }
         }
     }
     Page {