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

[Benjamin Zeller]

- Move Styles module into the main Components plugin

- Move Styles module into the main Components plugin

[Zsombor Egri (zsombi)]

Looks good

review: Approve

[Zsombor Egri (zsombi)]

Needs some love :)

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1588
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2422/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1150/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1152/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1149/console

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

review: Needs Fixing (continuous-integration)

[lp:~zeller-benjamin/ubuntu-ui-toolkit/qrcify2]

1589. By Benjamin Zeller on 2015-10-27

Merge

1590. By Benjamin Zeller on 2015-10-27

Beautify

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1590
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2425/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1153/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1155/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1152/console

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

review: Needs Fixing (continuous-integration)

[lp:~zeller-benjamin/ubuntu-ui-toolkit/qrcify2]

1591. By Benjamin Zeller on 2015-10-27

Merge with qrcify

1592. By Benjamin Zeller on 2015-10-27

Fix package build

1593. By Benjamin Zeller on 2015-10-27

Rollback temporary changes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1593
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2428/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1156
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1158
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1158/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1155

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

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/12/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/12/console

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
Approved revid is not set in launchpad. This is most likely a launchpad issue and re-approve should fix it. There is also a chance (although a very small one) this is a permission problem of the ps-jenkins bot.
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/27/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/27/console

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1593
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/63/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/145/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1593
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/61/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/153/console

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1593. By Benjamin Zeller on 2015-10-27

Rollback temporary changes

1592. By Benjamin Zeller on 2015-10-27

Fix package build

1591. By Benjamin Zeller on 2015-10-27

Merge with qrcify

1590. By Benjamin Zeller on 2015-10-27

Beautify

1589. By Benjamin Zeller on 2015-10-27

Merge

1588. By Benjamin Zeller on 2015-10-26

Merge base branch

1587. By Benjamin Zeller on 2015-09-10

Merge staging

1586. By Benjamin Zeller on 2015-07-31

Merge staging

1585. By Benjamin Zeller on 2015-07-30

Merge with base branch

1584. By Benjamin Zeller on 2015-07-30

- Move Styles module into main plugin qrc

=== modified file 'src/Ubuntu/Components/Components.pro'
--- src/Ubuntu/Components/Components.pro	2015-05-18 09:53:55 +0000
+++ src/Ubuntu/Components/Components.pro	2015-10-27 10:44:18 +0000
@@ -4,5 +4,4 @@
            ComponentModule.pro \
            Pickers   \
            Popups    \
-           Styles    \
            Themes

=== removed file 'src/Ubuntu/Components/Styles/Styles.pro'
--- src/Ubuntu/Components/Styles/Styles.pro	2015-10-23 05:42:14 +0000
+++ src/Ubuntu/Components/Styles/Styles.pro	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-TARGETPATH = Ubuntu/Components/Styles
-
-ARTWORK_FILES = $$system(find artwork -type f)
-
-QML_FILES += 1.2/ComboButtonStyle.qml \
-             1.2/PageHeadStyle.qml \
-             1.2/PullToRefreshStyle.qml \
-             1.3/PageHeadStyle.qml \
-	     1.3/ActionBarStyle.qml \
-	     1.3/PageHeaderStyle.qml \
-             $$ARTWORK_FILES
-
-load(ubuntu_qml_module)
-
-OTHER_FILES+=qmldir

=== removed file 'src/Ubuntu/Components/Styles/qmldir'
--- src/Ubuntu/Components/Styles/qmldir	2015-10-08 21:19:56 +0000
+++ src/Ubuntu/Components/Styles/qmldir	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-module Ubuntu.Components.Styles
-ComboButtonStyle 1.1 1.2/ComboButtonStyle.qml
-PullToRefreshStyle 1.1 1.2/PullToRefreshStyle.qml
-PageHeadStyle 1.1 1.2/PageHeadStyle.qml
-
-#version 1.2 introduced by ListItemStyle
-#version 1.3
-PageHeadStyle 1.3 1.3/PageHeadStyle.qml
-ActionBarStyle 1.3 1.3/ActionBarStyle.qml
-PageHeaderStyle 1.3 1.3/PageHeaderStyle.qml

=== modified file 'src/Ubuntu/Components/components.qrc'
--- src/Ubuntu/Components/components.qrc	2015-10-27 10:44:18 +0000
+++ src/Ubuntu/Components/components.qrc	2015-10-27 10:44:18 +0000
@@ -125,5 +125,11 @@
         <file>artwork/[e-mail]</file>
         <file>artwork/[e-mail]</file>
         <file>artwork/[e-mail]</file>
+        <file>Styles/1.2/ComboButtonStyle.qml</file>
+        <file>Styles/1.2/PageHeadStyle.qml</file>
+        <file>Styles/1.2/PullToRefreshStyle.qml</file>
+        <file>Styles/1.3/ActionBarStyle.qml</file>
+        <file>Styles/1.3/PageHeadStyle.qml</file>
+        <file>Styles/1.3/PageHeaderStyle.qml</file>
     </qresource>
 </RCC>

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-10-20 09:19:50 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-10-27 10:44:18 +0000
@@ -260,6 +260,15 @@
     qmlRegisterType<UCListItemStyle>(styleUri, 1, 2, "ListItemStyle");
     qmlRegisterType<UCListItemStyle, 1>(styleUri, 1, 3, "ListItemStyle");
 
+    //register styles
+    qmlRegisterType(QUrl("qrc:/Ubuntu/Components/Styles/1.2/ComboButtonStyle.qml"), styleUri, 1, 1, "ComboButtonStyle");
+    qmlRegisterType(QUrl("qrc:/Ubuntu/Components/Styles/1.2/PullToRefreshStyle.qml"), styleUri, 1, 1, "PullToRefreshStyle");
+    qmlRegisterType(QUrl("qrc:/Ubuntu/Components/Styles/1.2/PageHeadStyle.qml"), styleUri, 1, 1, "PageHeadStyle");
+
+    qmlRegisterType(QUrl("qrc:/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml") , styleUri, 1, 3, "PageHeadStyle");
+    qmlRegisterType(QUrl("qrc:/Ubuntu/Components/Styles/1.3/ActionBarStyle.qml"), styleUri, 1, 3, "ActionBarStyle");
+    qmlRegisterType(QUrl("qrc:/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml"), styleUri, 1, 3, "PageHeaderStyle");
+
     QQmlExtensionPlugin::initializeEngine(engine, uri);
     QQmlContext* context = engine->rootContext();