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

[Benjamin Zeller]

- Add all theme files to qrc
- Adapt theme engine to load the plugins

- Add all theme files to qrc
- Adapt theme engine to load the plugins

[Zsombor Egri (zsombi)]

Theme loading requires few tests to be added. All those @BUG marked points should be defended with tests.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1595
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2421/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1149/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1151/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1148/console

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

review: Needs Fixing (continuous-integration)

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

1596. By Benjamin Zeller on 2015-10-27

Merge with qrcify2

1597. By Benjamin Zeller on 2015-10-27

Remove remarks

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1597
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2427/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1155/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1157/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1154/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2427/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/11/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/11/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/26/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/26/console

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1597. By Benjamin Zeller on 2015-10-27

Remove remarks

1596. By Benjamin Zeller on 2015-10-27

Merge with qrcify2

1595. By Benjamin Zeller on 2015-10-26

Merge to staging

1594. By Benjamin Zeller on 2015-10-26

Remove qmlcompiler switch

1593. By Benjamin Zeller on 2015-10-26

Revert hack for qml compiler

1592. By Benjamin Zeller on 2015-09-10

Add missing sci files

1591. By Benjamin Zeller on 2015-09-10

* Workaround for AdaptivePageLayout failing in compiled mode
* Enable qtquickcompiler
* Typo in surugradient

1590. By Benjamin Zeller on 2015-09-10

Merge staging

1589. By Benjamin Zeller on 2015-08-05

- Use Item{} to import a plugin, allows much easier to maintain and read
code

1588. By Benjamin Zeller on 2015-07-31

- Most styles are loading now

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
--- src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-10-23 05:42:14 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-10-27 11:23:28 +0000
@@ -1,121 +1,20 @@
 TARGETPATH = Ubuntu/Components/Themes/Ambiance
 
-ARTWORK_FILES += artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail]
-
-
-QML_FILES += 1.2/ActivityIndicatorStyle.qml \
-             1.2/BubbleShape.qml \
-             1.2/ButtonForeground.qml \
-             1.2/ButtonStyle.qml \
-             1.2/CheckBoxStyle.qml \
-             1.2/ComboButtonStyle.qml \
-             1.2/DatePickerStyle.qml \
-             1.2/DialerHandStyle.qml \
-             1.2/DialerStyle.qml \
-             1.2/DialogForegroundStyle.qml \
-             1.2/HeadDividerStyle.qml \
-             1.2/HeaderStyle.qml \
-             1.2/HighlightMagnifier.qml \
-             1.2/ListItemOptionSelectorStyle.qml \
-             1.2/ListItemStyle.qml \
-             1.2/MainViewStyle.qml \
-             1.2/OptionSelectorStyle.qml \
-             1.2/OverflowPanel.qml \
-             1.2/PageHeadButton.qml \
-             1.2/PageHeadStyle.qml \
-             1.2/Palette.qml \
-             1.2/PartialColorize.qml \
-             1.2/PickerDelegateStyle.qml \
-             1.2/PickerStyle.qml \
-             1.2/PopoverForegroundStyle.qml \
-             1.2/ProgressBarStyle.qml \
-             1.2/ProgressionVisualStyle.qml \
-             1.2/PullToRefreshStyle.qml \
-             1.2/ScrollbarStyle.qml \
-             1.2/SheetForegroundStyle.qml \
-             1.2/SliderStyle.qml \
-             1.2/SwitchStyle.qml \
-             1.2/TabBarStyle.qml \
-             1.2/TextAreaStyle.qml \
-             1.2/TextCursorStyle.qml \
-             1.2/TextFieldStyle.qml \
-             1.2/ToolbarButtonStyle.qml \
-             1.2/ToolbarStyle.qml \
-             1.3/ActionBarStyle.qml \
-             1.3/ActivityIndicatorStyle.qml \
-             1.3/BubbleShape.qml \
-             1.3/ButtonForeground.qml \
-             1.3/ButtonStyle.qml \
-             1.3/CheckBoxStyle.qml \
-             1.3/ComboButtonStyle.qml \
-             1.3/DatePickerStyle.qml \
-             1.3/DialerHandStyle.qml \
-             1.3/DialerStyle.qml \
-             1.3/DialogForegroundStyle.qml \
-             1.3/HighlightMagnifier.qml \
-             1.3/ListItemOptionSelectorStyle.qml \
-             1.3/ListItemStyle.qml \
-             1.3/MainViewStyle.qml \
-             1.3/OptionSelectorStyle.qml \
-             1.3/OverflowPanel.qml \
-             1.3/PageHeadButton.qml \
-             1.3/PageHeadStyle.qml \
-             1.3/Palette.qml \
-             1.3/PartialColorize.qml \
-             1.3/PickerDelegateStyle.qml \
-             1.3/PickerStyle.qml \
-             1.3/PopoverForegroundStyle.qml \
-             1.3/ProgressBarStyle.qml \
-             1.3/ProgressionVisualStyle.qml \
-             1.3/PullToRefreshStyle.qml \
-             1.3/ScrollbarStyle.qml \
-             1.3/SectionsStyle.qml \
-             1.3/SheetForegroundStyle.qml \
-             1.3/SliderStyle.qml \
-             1.3/SwitchStyle.qml \
-             1.3/TabBarStyle.qml \
-             1.3/TextAreaStyle.qml \
-             1.3/TextCursorStyle.qml \
-             1.3/TextFieldStyle.qml \
-             1.3/ToolbarButtonStyle.qml \
-             1.3/ToolbarStyle.qml \
-             1.3/IconButtonStyle.qml \
-	     1.3/PageHeaderStyle.qml \
-             1.3/BottomEdgeHintStyle.qml \
-    $$ARTWORK_FILES
-
-load(ubuntu_qml_module)
-
-OTHER_FILES+=qmldir
+CXX_MODULE = qml
+TARGET  = UbuntuAmbianceTheme
+IMPORT_VERSION = 0.1
+
+QT *= qml
+
+HEADERS += \
+    ambianceplugin.h
+
+SOURCES += \
+    ambianceplugin.cpp
+
+OTHER_FILES += qmldir
+
+RESOURCES += \
+    ambiance.qrc
+
+load(ubuntu_qml_plugin)

=== added file 'src/Ubuntu/Components/Themes/Ambiance/ambiance.qrc'
--- src/Ubuntu/Components/Themes/Ambiance/ambiance.qrc	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/ambiance.qrc	2015-10-27 11:23:28 +0000
@@ -0,0 +1,119 @@
+<RCC>
+    <qresource prefix="/Ubuntu/Components/Themes/Ambiance">
+        <file>1.2/ActivityIndicatorStyle.qml</file>
+        <file>1.2/BubbleShape.qml</file>
+        <file>1.2/ButtonForeground.qml</file>
+        <file>1.2/ButtonStyle.qml</file>
+        <file>1.2/CheckBoxStyle.qml</file>
+        <file>1.2/ComboButtonStyle.qml</file>
+        <file>1.2/DatePickerStyle.qml</file>
+        <file>1.2/DialerHandStyle.qml</file>
+        <file>1.2/DialerStyle.qml</file>
+        <file>1.2/DialogForegroundStyle.qml</file>
+        <file>1.2/HeadDividerStyle.qml</file>
+        <file>1.2/HeaderStyle.qml</file>
+        <file>1.2/HighlightMagnifier.qml</file>
+        <file>1.2/ListItemOptionSelectorStyle.qml</file>
+        <file>1.2/ListItemStyle.qml</file>
+        <file>1.2/MainViewStyle.qml</file>
+        <file>1.2/OptionSelectorStyle.qml</file>
+        <file>1.2/OverflowPanel.qml</file>
+        <file>1.2/PageHeadButton.qml</file>
+        <file>1.2/PageHeadStyle.qml</file>
+        <file>1.2/Palette.qml</file>
+        <file>1.2/PartialColorize.qml</file>
+        <file>1.2/PickerDelegateStyle.qml</file>
+        <file>1.2/PickerStyle.qml</file>
+        <file>1.2/PopoverForegroundStyle.qml</file>
+        <file>1.2/ProgressBarStyle.qml</file>
+        <file>1.2/ProgressionVisualStyle.qml</file>
+        <file>1.2/PullToRefreshStyle.qml</file>
+        <file>1.2/ScrollbarStyle.qml</file>
+        <file>1.2/SheetForegroundStyle.qml</file>
+        <file>1.2/SliderStyle.qml</file>
+        <file>1.2/SwitchStyle.qml</file>
+        <file>1.2/TabBarStyle.qml</file>
+        <file>1.2/TextAreaStyle.qml</file>
+        <file>1.2/TextCursorStyle.qml</file>
+        <file>1.2/TextFieldStyle.qml</file>
+        <file>1.2/ToolbarButtonStyle.qml</file>
+        <file>1.2/ToolbarStyle.qml</file>
+        <file>1.3/ActionBarStyle.qml</file>
+        <file>1.3/ActivityIndicatorStyle.qml</file>
+        <file>1.3/BubbleShape.qml</file>
+        <file>1.3/ButtonForeground.qml</file>
+        <file>1.3/ButtonStyle.qml</file>
+        <file>1.3/CheckBoxStyle.qml</file>
+        <file>1.3/colorUtils.js</file>
+        <file>1.3/ComboButtonStyle.qml</file>
+        <file>1.3/DatePickerStyle.qml</file>
+        <file>1.3/DialerHandStyle.qml</file>
+        <file>1.3/DialerStyle.qml</file>
+        <file>1.3/DialogForegroundStyle.qml</file>
+        <file>1.3/HighlightMagnifier.qml</file>
+        <file>1.3/IconButtonStyle.qml</file>
+        <file>1.3/ListItemOptionSelectorStyle.qml</file>
+        <file>1.3/ListItemStyle.qml</file>
+        <file>1.3/MainViewStyle.qml</file>
+        <file>1.3/OptionSelectorStyle.qml</file>
+        <file>1.3/OverflowPanel.qml</file>
+        <file>1.3/PageHeadButton.qml</file>
+        <file>1.3/PageHeadStyle.qml</file>
+        <file>1.3/Palette.qml</file>
+        <file>1.3/PartialColorize.qml</file>
+        <file>1.3/PickerDelegateStyle.qml</file>
+        <file>1.3/PickerStyle.qml</file>
+        <file>1.3/PopoverForegroundStyle.qml</file>
+        <file>1.3/ProgressBarStyle.qml</file>
+        <file>1.3/ProgressionVisualStyle.qml</file>
+        <file>1.3/PullToRefreshStyle.qml</file>
+        <file>1.3/ScrollbarStyle.qml</file>
+        <file>1.3/scrollbarUtils.js</file>
+        <file>1.3/SectionsStyle.qml</file>
+        <file>1.3/SheetForegroundStyle.qml</file>
+        <file>1.3/SliderStyle.qml</file>
+        <file>1.3/sliderUtils.js</file>
+        <file>1.3/SwitchStyle.qml</file>
+        <file>1.3/TabBarStyle.qml</file>
+        <file>1.3/TextAreaStyle.qml</file>
+        <file>1.3/TextCursorStyle.qml</file>
+        <file>1.3/TextFieldStyle.qml</file>
+        <file>1.3/ToolbarButtonStyle.qml</file>
+        <file>1.3/ToolbarStyle.qml</file>
+        <file>1.3/PageHeaderStyle.qml</file>
+        <file>1.3/BottomEdgeHintStyle.qml</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+    </qresource>
+</RCC>

=== added file 'src/Ubuntu/Components/Themes/Ambiance/ambianceplugin.cpp'
--- src/Ubuntu/Components/Themes/Ambiance/ambianceplugin.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/ambianceplugin.cpp	2015-10-27 11:23:28 +0000
@@ -0,0 +1,7 @@
+#include "ambianceplugin.h"
+
+void AmbiancePlugin::registerTypes(const char *uri)
+{
+    Q_UNUSED(uri);
+    //do nothing, the plugin is just here to carry the qrc file
+}

=== added file 'src/Ubuntu/Components/Themes/Ambiance/ambianceplugin.h'
--- src/Ubuntu/Components/Themes/Ambiance/ambianceplugin.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/ambianceplugin.h	2015-10-27 11:23:28 +0000
@@ -0,0 +1,15 @@
+#ifndef AMBIANCEPLUGIN_H
+#define AMBIANCEPLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class AmbiancePlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // AMBIANCEPLUGIN_H

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/qmldir'
--- src/Ubuntu/Components/Themes/Ambiance/qmldir	2015-10-02 22:48:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/qmldir	2015-10-27 11:23:28 +0000
@@ -1,87 +1,89 @@
 module Ubuntu.Components.Themes.Ambiance
-internal ActivityIndicatorStyle ./1.2/ActivityIndicatorStyle.qml
-internal ButtonStyle ./1.2/ButtonStyle.qml
-internal DialogForegroundStyle ./1.2/DialogForegroundStyle.qml
-internal HeaderStyle ./1.2/HeaderStyle.qml
-internal PageHeadButton ./1.2/PageHeadButton.qml
-MainViewStyle 0.1 ./1.2/MainViewStyle.qml
-ListItemOptionSelector 0.1 ./1.2/ListItemOptionSelector.qml
-OptionSelectorStyle 0.1 ./1.2/OptionSelectorStyle.qml
-PopoverForegroundStyle 0.1 ./1.2/PopoverForegroundStyle.qml
-internal ScrollbarStyle ./1.2/ScrollbarStyle.qml
-internal SheetForegroundStyle ./1.2/SheetForegroundStyle.qml
-internal SliderStyle ./1.2/SliderStyle.qml
-TabBarStyle 0.1 ./1.2/TabBarStyle.qml
-TextAreaStyle 0.1 ./1.2/TextAreaStyle.qml
-internal TextCursorStyle ./1.2/TextCursorStyle.qml
-TextFieldStyle 0.1 ./1.2/TextFieldStyle.qml
-internal ToolbarButtonStyle ./1.2/ToolbarButtonStyle.qml
-internal ToolbarStyle ./1.2/ToolbarStyle.qml
-internal BubbleShape ./1.2/BubbleShape.qml
-PickerStyle 0.1 ./1.2/PickerStyle.qml
-DatePickerStyle 0.1 ./1.2/DatePickerStyle.qml
-PickerDelegateStyle 0.1 ./1.2/PickerDelegateStyle.qml
-DialerStyle 0.1 ./1.2/DialerStyle.qml
-DialerHandStyle 0.1 ./1.2/DialerHandStyle.qml
-internal HighlightMagnifier ./1.2/HighlightMagnifier.qml
+plugin UbuntuAmbianceTheme
+
+internal ActivityIndicatorStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/ActivityIndicatorStyle.qml
+internal ButtonStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/ButtonStyle.qml
+internal DialogForegroundStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/DialogForegroundStyle.qml
+internal HeaderStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/HeaderStyle.qml
+internal PageHeadButton qrc:/Ubuntu/Components/Themes/Ambiance/1.2/PageHeadButton.qml
+MainViewStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/MainViewStyle.qml
+ListItemOptionSelector 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/ListItemOptionSelector.qml
+OptionSelectorStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/OptionSelectorStyle.qml
+PopoverForegroundStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/PopoverForegroundStyle.qml
+internal ScrollbarStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/ScrollbarStyle.qml
+internal SheetForegroundStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/SheetForegroundStyle.qml
+internal SliderStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/SliderStyle.qml
+TabBarStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/TabBarStyle.qml
+TextAreaStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/TextAreaStyle.qml
+internal TextCursorStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/TextCursorStyle.qml
+TextFieldStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/TextFieldStyle.qml
+internal ToolbarButtonStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/ToolbarButtonStyle.qml
+internal ToolbarStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/ToolbarStyle.qml
+internal BubbleShape qrc:/Ubuntu/Components/Themes/Ambiance/1.2/BubbleShape.qml
+PickerStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/PickerStyle.qml
+DatePickerStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/DatePickerStyle.qml
+PickerDelegateStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/PickerDelegateStyle.qml
+DialerStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/DialerStyle.qml
+DialerHandStyle 0.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/DialerHandStyle.qml
+internal HighlightMagnifier qrc:/Ubuntu/Components/Themes/Ambiance/1.2/HighlightMagnifier.qml
 
 #version 1.0
-MainViewStyle 1.0 ./1.2/MainViewStyle.qml
-ListItemOptionSelector 1.0 ./1.2/ListItemOptionSelector.qml
-OptionSelectorStyle 1.0 ./1.2/OptionSelectorStyle.qml
-PopoverForegroundStyle 1.0 ./1.2/PopoverForegroundStyle.qml
-TabBarStyle 1.0 ./1.2/TabBarStyle.qml
-TextAreaStyle 1.0 ./1.2/TextAreaStyle.qml
-TextFieldStyle 1.0 ./1.2/TextFieldStyle.qml
-PickerStyle 1.0 ./1.2/PickerStyle.qml
-DatePickerStyle 1.0 ./1.2/DatePickerStyle.qml
-PickerDelegateStyle 1.0 ./1.2/PickerDelegateStyle.qml
-DialerStyle 1.0 ./1.2/DialerStyle.qml
-DialerHandStyle 1.0 ./1.2/DialerHandStyle.qml
+MainViewStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/MainViewStyle.qml
+ListItemOptionSelector 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/ListItemOptionSelector.qml
+OptionSelectorStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/OptionSelectorStyle.qml
+PopoverForegroundStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/PopoverForegroundStyle.qml
+TabBarStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/TabBarStyle.qml
+TextAreaStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/TextAreaStyle.qml
+TextFieldStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/TextFieldStyle.qml
+PickerStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/PickerStyle.qml
+DatePickerStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/DatePickerStyle.qml
+PickerDelegateStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/PickerDelegateStyle.qml
+DialerStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/DialerStyle.qml
+DialerHandStyle 1.0 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/DialerHandStyle.qml
 
 #version 1.1
-ComboButtonStyle 1.1 ./1.2/ComboButtonStyle.qml
-PullToRefreshStyle 1.1 ./1.2/PullToRefreshStyle.qml
-PageHeadStyle 1.1 ./1.2/PageHeadStyle.qml
-Palette 1.1 ./1.2/Palette.qml
-ButtonStyle 1.1 ./1.2/ButtonStyle.qml
-SliderStyle 1.1 ./1.2/SliderStyle.qml
-SwitchStyle 1.1 ./1.2/SwitchStyle.qml
-CheckBoxStyle 1.1 ./1.2/CheckBoxStyle.qml
+ComboButtonStyle 1.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/ComboButtonStyle.qml
+PullToRefreshStyle 1.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/PullToRefreshStyle.qml
+PageHeadStyle 1.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/PageHeadStyle.qml
+Palette 1.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/Palette.qml
+ButtonStyle 1.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/ButtonStyle.qml
+SliderStyle 1.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/SliderStyle.qml
+SwitchStyle 1.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/SwitchStyle.qml
+CheckBoxStyle 1.1 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/CheckBoxStyle.qml
 
-internal OverflowPanel ./1.2/OverflowPanel.qml
-internal HeadDividerStyle ./1.2/HeadDividerStyle.qml
+internal OverflowPanel qrc:/Ubuntu/Components/Themes/Ambiance/1.2/OverflowPanel.qml
+internal HeadDividerStyle qrc:/Ubuntu/Components/Themes/Ambiance/1.2/HeadDividerStyle.qml
 
 #version 1.2
-ListItemStyle 1.2 ./1.2/ListItemStyle.qml
+ListItemStyle 1.2 qrc:/Ubuntu/Components/Themes/Ambiance/1.2/ListItemStyle.qml
 
 #################################################
 #version 1.3
-ActionBarStyle 1.3 ./1.3/ActionBarStyle.qml
-MainViewStyle 1.3 ./1.3/MainViewStyle.qml
-ListItemOptionSelector 1.3 ./1.3/ListItemOptionSelector.qml
-OptionSelectorStyle 1.3 ./1.3/OptionSelectorStyle.qml
-PopoverForegroundStyle 1.3 ./1.3/PopoverForegroundStyle.qml
-TabBarStyle 1.3 ./1.3/TabBarStyle.qml
-TextAreaStyle 1.3 ./1.3/TextAreaStyle.qml
-TextFieldStyle 1.3 ./1.3/TextFieldStyle.qml
-PickerStyle 1.3 ./1.3/PickerStyle.qml
-DatePickerStyle 1.3 ./1.3/DatePickerStyle.qml
-PickerDelegateStyle 1.3 ./1.3/PickerDelegateStyle.qml
-DialerStyle 1.3 ./1.3/DialerStyle.qml
-DialerHandStyle 1.3 ./1.3/DialerHandStyle.qml
-
-ComboButtonStyle 1.3 ./1.3/ComboButtonStyle.qml
-PullToRefreshStyle 1.3 ./1.3/PullToRefreshStyle.qml
-PageHeadStyle 1.3 ./1.3/PageHeadStyle.qml
-Palette 1.3 ./1.3/Palette.qml
-ButtonStyle 1.3 ./1.3/ButtonStyle.qml
-SliderStyle 1.3 ./1.3/SliderStyle.qml
-SwitchStyle 1.3 ./1.3/SwitchStyle.qml
-CheckBoxStyle 1.3 ./1.3/CheckBoxStyle.qml
-
-ListItemStyle 1.3 ./1.3/ListItemStyle.qml
-internal SliderUtils 1.3/sliderUtils.js
-internal ScrollbarUtils 1.3/scrollbarUtils.js
-internal ColorUtils 1.3/colorUtils.js
-PageHeaderStyle 1.3 ./1.3/PageHeaderStyle.qml
+ActionBarStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml
+MainViewStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/MainViewStyle.qml
+ListItemOptionSelector 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/ListItemOptionSelector.qml
+OptionSelectorStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml
+PopoverForegroundStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/PopoverForegroundStyle.qml
+TabBarStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/TabBarStyle.qml
+TextAreaStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml
+TextFieldStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/TextFieldStyle.qml
+PickerStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/PickerStyle.qml
+DatePickerStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/DatePickerStyle.qml
+PickerDelegateStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/PickerDelegateStyle.qml
+DialerStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/DialerStyle.qml
+DialerHandStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/DialerHandStyle.qml
+
+ComboButtonStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml
+PullToRefreshStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml
+PageHeadStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml
+Palette 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/Palette.qml
+ButtonStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/ButtonStyle.qml
+SliderStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/SliderStyle.qml
+SwitchStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/SwitchStyle.qml
+CheckBoxStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml
+
+ListItemStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml
+internal SliderUtils qrc:/Ubuntu/Components/Themes/Ambiance/1.3/sliderUtils.js
+internal ScrollbarUtils qrc:/Ubuntu/Components/Themes/Ambiance/1.3/scrollbarUtils.js
+internal ColorUtils qrc:/Ubuntu/Components/Themes/Ambiance/1.3/colorUtils.js
+PageHeaderStyle 1.3 qrc:/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml

=== modified file 'src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro'
--- src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro	2015-08-06 22:47:38 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro	2015-10-27 11:23:28 +0000
@@ -1,18 +1,24 @@
 TARGETPATH = Ubuntu/Components/Themes/SuruDark
 
+CXX_MODULE = qml
+TARGET  = UbuntuSuruDarkTheme
+IMPORT_VERSION = 0.1
+
+QT *= qml
+
 PARENT_THEME_FILE = parent_theme
-ARTWORK_FILES +=  artwork/[e-mail]
-
-QML_FILES += 1.2/MainViewStyle.qml \
-             1.2/OptionSelectorStyle.qml \
-             1.2/Palette.qml \
-             1.2/TabBarStyle.qml \
-             1.2/ListItemStyle.qml \
-             1.3/OptionSelectorStyle.qml \
-             1.3/Palette.qml \
-             1.3/TabBarStyle.qml \
-             1.3/ListItemStyle.qml \
-             $$ARTWORK_FILES \
-             $$PARENT_THEME_FILE
-
-load(ubuntu_qml_module)
+QML_FILES += $$PARENT_THEME_FILE
+
+HEADERS += \
+    surudarkplugin.h
+
+SOURCES += \
+    surudarkplugin.cpp
+
+RESOURCES += \
+    surudark.qrc
+
+OTHER_FILES += qmldir
+
+load(ubuntu_qml_plugin)
+

=== modified file 'src/Ubuntu/Components/Themes/SuruDark/qmldir'
--- src/Ubuntu/Components/Themes/SuruDark/qmldir	2015-04-24 14:48:00 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/qmldir	2015-10-27 11:23:28 +0000
@@ -1,7 +1,8 @@
 module Ubuntu.Components.Themes.SuruDark
+plugin UbuntuSuruDarkTheme
 
 #version 1.1
-Palette 1.1 ./1.2/Palette.qml
+Palette 1.1 qrc:/Ubuntu/Components/Themes/SuruDark/1.2/Palette.qml
 
 #version 1.3
-Palette 1.3 ./1.3/Palette.qml
+Palette 1.3 qrc:/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml

=== added file 'src/Ubuntu/Components/Themes/SuruDark/surudark.qrc'
--- src/Ubuntu/Components/Themes/SuruDark/surudark.qrc	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/surudark.qrc	2015-10-27 11:23:28 +0000
@@ -0,0 +1,14 @@
+<RCC>
+    <qresource prefix="/Ubuntu/Components/Themes/SuruDark">
+        <file>1.2/ListItemStyle.qml</file>
+        <file>1.2/MainViewStyle.qml</file>
+        <file>1.2/OptionSelectorStyle.qml</file>
+        <file>1.2/Palette.qml</file>
+        <file>1.2/TabBarStyle.qml</file>
+        <file>1.3/ListItemStyle.qml</file>
+        <file>1.3/OptionSelectorStyle.qml</file>
+        <file>1.3/Palette.qml</file>
+        <file>1.3/TabBarStyle.qml</file>
+        <file>artwork/[e-mail]</file>
+    </qresource>
+</RCC>

=== added file 'src/Ubuntu/Components/Themes/SuruDark/surudarkplugin.cpp'
--- src/Ubuntu/Components/Themes/SuruDark/surudarkplugin.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/surudarkplugin.cpp	2015-10-27 11:23:28 +0000
@@ -0,0 +1,7 @@
+#include "surudarkplugin.h"
+
+void SuruDarkPlugin::registerTypes(const char *uri)
+{
+    Q_UNUSED(uri);
+    //do nothing, the plugin is just here to carry the qrc file
+}

=== added file 'src/Ubuntu/Components/Themes/SuruDark/surudarkplugin.h'
--- src/Ubuntu/Components/Themes/SuruDark/surudarkplugin.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/SuruDark/surudarkplugin.h	2015-10-27 11:23:28 +0000
@@ -0,0 +1,15 @@
+#ifndef SURUDARKPLUGIN_H
+#define SURUDARKPLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class SuruDarkPlugin: public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // SURUDARKPLUGIN_H

=== modified file 'src/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro'
--- src/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro	2015-05-19 09:23:01 +0000
+++ src/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro	2015-10-27 11:23:28 +0000
@@ -1,17 +1,27 @@
 TARGETPATH = Ubuntu/Components/Themes/SuruGradient
 
+CXX_MODULE = qml
+TARGET  = UbuntuSuruGradientTheme
+IMPORT_VERSION = 0.1
+
+QT *= qml
+
 PARENT_THEME_FILE = parent_theme
 DEPRECATED_FILE = deprecated
-ARTWORK_FILES +=  artwork/[e-mail] \
-             artwork/[e-mail] \
-             artwork/[e-mail] \
 
-QML_FILES += MainViewStyle.qml \
-             OptionSelectorStyle.qml \
-             Palette.qml \
-             TabBarStyle.qml \
-    $$ARTWORK_FILES \
+QML_FILES += \
     $$PARENT_THEME_FILE \
     $$DEPRECATED_FILE
 
-load(ubuntu_qml_module)
+HEADERS += \
+    surugradientplugin.h
+
+SOURCES += \
+    surugradientplugin.cpp
+
+RESOURCES += \
+    surugradient.qrc
+
+OTHER_FILES += qmldir
+
+load(ubuntu_qml_plugin)

=== modified file 'src/Ubuntu/Components/Themes/SuruGradient/qmldir'
--- src/Ubuntu/Components/Themes/SuruGradient/qmldir	2014-08-07 19:24:52 +0000
+++ src/Ubuntu/Components/Themes/SuruGradient/qmldir	2015-10-27 11:23:28 +0000
@@ -1,4 +1,5 @@
 module Ubuntu.Components.Themes.SuruGradient
+plugin UbuntuSuruGradientTheme
 
 #version 1.1
-Palette 1.1 Palette.qml
+Palette 1.1 qrc:/Ubuntu/Components/Themes/SuruGradient/Palette.qml

=== added file 'src/Ubuntu/Components/Themes/SuruGradient/surugradient.qrc'
--- src/Ubuntu/Components/Themes/SuruGradient/surugradient.qrc	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/SuruGradient/surugradient.qrc	2015-10-27 11:23:28 +0000
@@ -0,0 +1,11 @@
+<RCC>
+    <qresource prefix="/Ubuntu/Components/Themes/SuruGradient">
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>artwork/[e-mail]</file>
+        <file>MainViewStyle.qml</file>
+        <file>OptionSelectorStyle.qml</file>
+        <file>Palette.qml</file>
+        <file>TabBarStyle.qml</file>
+    </qresource>
+</RCC>

=== added file 'src/Ubuntu/Components/Themes/SuruGradient/surugradientplugin.cpp'
--- src/Ubuntu/Components/Themes/SuruGradient/surugradientplugin.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/SuruGradient/surugradientplugin.cpp	2015-10-27 11:23:28 +0000
@@ -0,0 +1,7 @@
+#include "surugradientplugin.h"
+
+void SuruGradientPlugin::registerTypes(const char *uri)
+{
+    Q_UNUSED(uri);
+    //do nothing, the plugin is just here to carry the qrc file
+}

=== added file 'src/Ubuntu/Components/Themes/SuruGradient/surugradientplugin.h'
--- src/Ubuntu/Components/Themes/SuruGradient/surugradientplugin.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/SuruGradient/surugradientplugin.h	2015-10-27 11:23:28 +0000
@@ -0,0 +1,15 @@
+#ifndef SURUGRADIENTPLUGIN_H
+#define SURUGRADIENTPLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class SuruGradientPlugin: public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // SURUGRADIENTPLUGIN_H

=== modified file 'src/Ubuntu/Components/Themes/ThemesModule.pro'
--- src/Ubuntu/Components/Themes/ThemesModule.pro	2015-05-19 09:23:01 +0000
+++ src/Ubuntu/Components/Themes/ThemesModule.pro	2015-10-27 11:23:28 +0000
@@ -1,12 +1,20 @@
 TARGETPATH = Ubuntu/Components/Themes
 
-
-ARTWORK_FILES = $$system(find artwork -type f)
-
-QML_FILES += 1.2/Palette.qml \
-             1.2/PaletteValues.qml \
-             1.3/Palette.qml \
-             1.3/PaletteValues.qml \
-             $$ARTWORK_FILES
-
-load(ubuntu_qml_module)
+CXX_MODULE = qml
+TARGET  = UbuntuThemesModule
+IMPORT_VERSION = 0.1
+
+QT *= qml
+
+HEADERS += \
+    themesplugin.h
+
+SOURCES += \
+    themesplugin.cpp
+
+RESOURCES += \
+    themesmodule.qrc
+
+OTHER_FILES += qmldir
+
+load(ubuntu_qml_plugin)

=== modified file 'src/Ubuntu/Components/Themes/qmldir'
--- src/Ubuntu/Components/Themes/qmldir	2015-05-26 07:38:55 +0000
+++ src/Ubuntu/Components/Themes/qmldir	2015-10-27 11:23:28 +0000
@@ -1,7 +1,9 @@
 module Ubuntu.Components.Themes
-Palette 0.1 ./1.2/Palette.qml
-PaletteValues 0.1 ./1.2/PaletteValues.qml
+plugin UbuntuThemesModule
+
+Palette 0.1 qrc:/Ubuntu/Components/Themes/1.2/Palette.qml
+PaletteValues 0.1 qrc:/Ubuntu/Components/Themes/1.2/PaletteValues.qml
 
 #version 1.3
-Palette 1.3 ./1.3/Palette.qml
-PaletteValues 1.3 ./1.3/PaletteValues.qml
+Palette 1.3 qrc:/Ubuntu/Components/Themes/1.3/Palette.qml
+PaletteValues 1.3 qrc:/Ubuntu/Components/Themes/1.3/PaletteValues.qml

=== added file 'src/Ubuntu/Components/Themes/themesmodule.qrc'
--- src/Ubuntu/Components/Themes/themesmodule.qrc	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/themesmodule.qrc	2015-10-27 11:23:28 +0000
@@ -0,0 +1,8 @@
+<RCC>
+    <qresource prefix="/Ubuntu/Components/Themes">
+        <file>1.2/Palette.qml</file>
+        <file>1.2/PaletteValues.qml</file>
+        <file>1.3/Palette.qml</file>
+        <file>1.3/PaletteValues.qml</file>
+    </qresource>
+</RCC>

=== added file 'src/Ubuntu/Components/Themes/themesplugin.cpp'
--- src/Ubuntu/Components/Themes/themesplugin.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/themesplugin.cpp	2015-10-27 11:23:28 +0000
@@ -0,0 +1,7 @@
+#include "themesplugin.h"
+
+void ThemesPlugin::registerTypes(const char *uri)
+{
+    Q_UNUSED(uri);
+    //do nothing, the plugin is just here to carry the qrc file
+}

=== added file 'src/Ubuntu/Components/Themes/themesplugin.h'
--- src/Ubuntu/Components/Themes/themesplugin.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Themes/themesplugin.h	2015-10-27 11:23:28 +0000
@@ -0,0 +1,15 @@
+#ifndef THEMESPLUGIN_H
+#define THEMESPLUGIN_H
+
+#include <QQmlExtensionPlugin>
+
+class ThemesPlugin: public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif // THEMESPLUGIN_H

=== modified file 'src/Ubuntu/Components/plugin/uctheme.cpp'
--- src/Ubuntu/Components/plugin/uctheme.cpp	2015-10-20 11:32:09 +0000
+++ src/Ubuntu/Components/plugin/uctheme.cpp	2015-10-27 11:23:28 +0000
@@ -40,6 +40,7 @@
 
 #include <QtQml/private/qqmlproperty_p.h>
 #include <QtQml/private/qqmlabstractbinding_p.h>
+#include <QtQml/private/qqmldirparser_p.h>
 #define foreach Q_FOREACH
 #include <QtQml/private/qqmlbinding_p.h>
 #undef foreach
@@ -169,6 +170,7 @@
         pathList << qml2ImportPath.split(':', QString::SkipEmptyParts);
     }
     pathList << QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath).split(':', QString::SkipEmptyParts);
+
     // fix folders
     QStringList result;
     Q_FOREACH(const QString &path, pathList) {
@@ -192,9 +194,37 @@
         // QUrl needs a trailing slash to understand it's a directory
         QString absoluteThemeFolder = QDir(themeFolder).absolutePath().append('/');
         if (QDir(absoluteThemeFolder).exists()) {
+
+            QString qmlDirFileName = absoluteThemeFolder + "qmldir";
             record.deprecated = QFile::exists(absoluteThemeFolder + "deprecated");
-            record.shared = QFile::exists(absoluteThemeFolder + "qmldir");
+            record.shared = QFile::exists(qmlDirFileName);
             record.path = QUrl::fromLocalFile(absoluteThemeFolder);
+
+            if (record.shared) {
+                QQmlDirParser qmlDir;
+                QFile qmlDirFile(qmlDirFileName);
+
+                if (!qmlDirFile.open(QIODevice::ReadOnly)) {
+                    qmlInfo(0) << "Could not read qmldir file of "<<record.path<<" skipping";
+                    //return empty ThemeRecord if qmldir is not readable
+                    break;
+                }
+
+                qmlDir.parse(qmlDirFile.readAll());
+                if (qmlDir.hasError()) {
+                    qmlInfo(0) << "Error parsing file "<<qmlDirFileName
+                                  << qmlDir.errors(record.name);
+                    //return empty ThemeRecord if qmldir is not valid
+                    break;
+                }
+
+                Q_FOREACH(const QQmlDirParser::Component &comp, qmlDir.components()) {
+                    if (comp.fileName.startsWith(QStringLiteral("qrc:/"))) {
+                        record.requiresImport = true;
+                        break;
+                    }
+                }
+            }
             break;
         }
     }
@@ -403,6 +433,29 @@
     Q_EMIT nameChanged();
 }
 
+bool UCTheme::loadThemePlugin(const ThemeRecord &theme, quint16 version, const QString &component)
+{
+    //In case we ever support changing the engine we need to add additional logic to handle it correctly
+    if (theme.pluginLoaded)
+        return true;
+
+    static QString qmlTemplate("import QtQuick 2.4\nimport %1 %2.%3\n%4{}");
+    QQmlComponent comp(m_engine);
+    comp.setData(qmlTemplate
+                 .arg(theme.name)
+                 .arg(MAJOR_VERSION(version))
+                 .arg(MINOR_VERSION(version))
+                 .arg(component).toUtf8(), QUrl());
+
+   if (comp.errors().isEmpty()) {
+       theme.pluginLoaded = true;
+       return true;
+   }
+
+    qmlInfo(this) << "Importing the plugin for theme "<<theme.name<<" failed. "<<comp.errors();
+    return false;
+}
+
 void UCTheme::updateThemePaths()
 {
     m_themePaths.clear();
@@ -569,6 +622,7 @@
     if (isFallback) {
         (*isFallback) = false;
     }
+
     Q_FOREACH (const ThemeRecord &themePath, m_themePaths) {
         QUrl styleUrl;
         /*
@@ -588,6 +642,25 @@
         // we stop at version 1.2 as we do not have support for earlier themes anymore.
         for (int minor = MINOR_VERSION(styleVersion); minor >= 2; minor--) {
             QString versionedName = QStringLiteral("%1.%2/%3").arg(MAJOR_VERSION(styleVersion)).arg(minor).arg(styleName);
+            if (themePath.requiresImport) {
+                QString prefixedName = themePath.name;
+                prefixedName.replace(QStringLiteral("."), QStringLiteral("/"));
+                prefixedName = QStringLiteral("%1/%2")
+                        .arg(prefixedName)
+                        .arg(versionedName);
+
+                if (loadThemePlugin(themePath, version, QStringLiteral("Item")) ) {
+                    if (QFile::exists(QStringLiteral(":/")+prefixedName)) {
+                        // set fallback warning if the theme is shared
+                        if (isFallback && (version != styleVersion)) {
+                            (*isFallback) = true;
+                        }
+                        return QUrl(QStringLiteral("qrc:/")+prefixedName);
+                    }
+                }
+            }
+
+            // no style yet? Maybe its not in the qrc
             styleUrl = themePath.path.resolved(versionedName);
             if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
                 // set fallback warning if the theme is shared
@@ -600,6 +673,21 @@
 
         // if we don't get any style, get the non-versioned ones for non-shared and deprecated styles
         if (!themePath.shared || themePath.deprecated) {
+            if (themePath.requiresImport) {
+                QString prefixedName = themePath.name;
+                prefixedName.replace(QStringLiteral("."), QStringLiteral("/"));
+                prefixedName = QStringLiteral("%1/%2")
+                        .arg(prefixedName)
+                        .arg(styleName);
+
+                if (loadThemePlugin(themePath, version, QStringLiteral("Item")) ) {
+                    if (QFile::exists(QStringLiteral(":/")+prefixedName)) {
+                        return QUrl(QStringLiteral("qrc:/")+prefixedName);
+                    }
+                }
+            }
+
+            //no style yet? fall back to filesystem
             styleUrl = themePath.path.resolved(styleName);
             if (styleUrl.isValid() && QFile::exists(styleUrl.toLocalFile())) {
                 return styleUrl;
@@ -703,7 +791,6 @@
             }
         }
     }
-
     return component;
 }
 

=== modified file 'src/Ubuntu/Components/plugin/uctheme.h'
--- src/Ubuntu/Components/plugin/uctheme.h	2015-10-20 11:32:09 +0000
+++ src/Ubuntu/Components/plugin/uctheme.h	2015-10-27 11:23:28 +0000
@@ -47,7 +47,7 @@
     static quint16 previousVersion;
     struct ThemeRecord {
         ThemeRecord() :
-            shared(false), deprecated(false)
+            shared(false), deprecated(false), requiresImport(false), pluginLoaded(false)
         {}
         ThemeRecord(const QString &name, const QUrl &path, bool shared, bool deprecated) :
             name(name), path(path), shared(shared), deprecated(deprecated)
@@ -61,6 +61,8 @@
         QUrl path;
         bool shared:1;
         bool deprecated:1;
+        bool requiresImport:1;
+        mutable bool pluginLoaded: 1;
     };
 
     explicit UCTheme(QObject *parent = 0);
@@ -100,7 +102,6 @@
     {
         m_completed = true;
     }
-
 private Q_SLOTS:
     void resetPalette();
     void _q_defaultThemeChanged();
@@ -112,6 +113,7 @@
     void updateThemePaths();
     QUrl styleUrl(const QString& styleName, quint16 version, bool *isFallback = NULL);
     void loadPalette(bool notify = true);
+    bool loadThemePlugin(const ThemeRecord &theme, quint16 version, const QString &component);
     void updateThemedItems();
 
     class PaletteConfig