Merge lp:~saviq/unity8/fix-pageheader-colours into lp:unity8

[Michał Sawicz]

Use the correct API in PageHeader.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes. Both tryDash and the actual dash work fine now.

 * Did you make sure that your branch does not contain spurious tags?
Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Tim Peeters (tpeeters)]

thanks, looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1114
http://jenkins.qa.ubuntu.com/job/unity8-ci/3782/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3079
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/876
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/876
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/876/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/876
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4322
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4322/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11054

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3782/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
Yes

review: Approve

=== modified file 'qml/Components/PageHeader.qml'
--- qml/Components/PageHeader.qml	2014-07-31 16:49:50 +0000
+++ qml/Components/PageHeader.qml	2014-08-05 21:49:51 +0000
@@ -169,6 +169,7 @@
                 property var styledItem: searchHeader
                 property string title
                 property var config: PageHeadConfiguration {
+                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"
                     backAction: Action {
                         iconName: "back"
                         onTriggered: {
@@ -247,10 +248,10 @@
                 contentHeight: height
                 opacity: headerContainer.clip || !headerContainer.showSearch ? 1 : 0 // setting visible false cause column to relayout
                 separatorSource: ""
-                textColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"
                 property var styledItem: header
                 property string title: root.title
                 property var config: PageHeadConfiguration {
+                    foregroundColor: root.scopeStyle ? root.scopeStyle.headerForeground : "grey"
                     backAction: Action {
                         iconName: "back"
                         visible: root.showBackButton