Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/uitk_staging_qt55_components_install_plugins_qmltypes_fail into lp:ubuntu-ui-toolkit/staging

[Timo Jyrinki]

Add PageHeadStyle 1.3 reference to fix install_plugins_qmltypes failure with Qt 5.5.

[Zsombor Egri (zsombi)]

It is weird that this is needed, but does not make any harm.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1558
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1984/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/712/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/714/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/711/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/993/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/301/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/300/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/300/console

review: Needs Fixing (continuous-integration)

[lp:~timo-jyrinki/ubuntu-ui-toolkit/uitk_staging_qt55_components_install_plugins_qmltypes_fail]

1559. By Timo Jyrinki on 2015-07-13

Update components.api as requested.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1559
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1989/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/717
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/719
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/719/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/716

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

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-07-13 08:19:11 +0000
+++ components.api	2015-07-13 15:08:09 +0000
@@ -626,7 +626,7 @@
     property Action backAction
     property Item contents
     property PageHeadConfiguration head
-Ubuntu.Components.Styles.PageHeadStyle 1.1: Item
+Ubuntu.Components.Styles.PageHeadStyle 1.3 1.1: Item
     property double contentHeight
     property string fontSize
     property int fontWeight

=== modified file 'modules/Ubuntu/Components/Styles/qmldir'
--- modules/Ubuntu/Components/Styles/qmldir	2015-05-02 13:27:39 +0000
+++ modules/Ubuntu/Components/Styles/qmldir	2015-07-13 15:08:09 +0000
@@ -4,3 +4,4 @@
 PageHeadStyle 1.1 1.2/PageHeadStyle.qml
 
 #version 1.2 introduced by ListItemStyle
+PageHeadStyle 1.3 1.2/PageHeadStyle.qml