Merge lp:~zsombi/ubuntu-ui-toolkit/theme_versioning into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Provide import version information for StyledItema and remove theme.version obsolete property.

-= DO NOT HAPPROVE IT =-

[Cris Dywan (kalikiana)]

Smart approach, didn't see that one coming!

My gut feeling is that removing "version" now (as opposed to making it a no-op) might come as a surprise to some, since it has been there since May. Although our policy has no timeframe attached. If Tim is fine affirming this I won't let me paranoia stand in the way.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1657
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2325/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1053/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1055/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1052/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1658
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2327/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1055
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1057
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1057/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1054

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

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Good to go!

review: Approve

[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/1106/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/414
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/413
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/413/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/413

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/theme_versioning]

1659. By Zsombor Egri on 2015-09-30

staging sync

1660. By Zsombor Egri on 2015-09-30

fixing crashes and types

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1660
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2337/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1065/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1067/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1064/console

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

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/theme_versioning]

1661. By Zsombor Egri on 2015-10-01

reverting removed AnimatedItem type

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1661
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2347/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1075
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1077
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1077/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1074

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

review: Approve (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/theme_versioning]

1662. By Zsombor Egri on 2015-10-01

staging sync

1663. By Zsombor Egri on 2015-10-01

StyledItems load the style based on teh import version and not falling back to the smallest imported version in case imports are mixed

1664. By Zsombor Egri on 2015-10-01

staging sync

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1664
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2355/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1083
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1085
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1085/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1082

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

+ qWarning() << msg;

I only realized now the message is a bit awkward, the suggestions to improve it:
Use qmlInfo so it shows the offending component.
Use a static bool to show it once - it's enough to give you a hint, too many warnings are not useful and potentially a performance issue, as we found with deprecations, so let's make it work the same way.

And the mixing now works like it did before. So you don't get tons of errors, but you do get a clear message. Thanks a lot for this change! Less is more also in this case!

review: Needs Fixing

[Cris Dywan (kalikiana)]

As https://code.launchpad.net/~zsombi/ubuntu-ui-toolkit/fixThemingFallback/+merge/273497 was merged in the landing this one will need updating.

[lp:~zsombi/ubuntu-ui-toolkit/theme_versioning]

1665. By Zsombor Egri on 2015-10-20

new prereq sync

1666. By Zsombor Egri on 2015-10-20

use qmlInfo to locate the component where the version mixing is detected

1667. By Zsombor Egri on 2015-10-21

removing orphan theme.version from PageHeader.qml

Unmerged revisions

=== modified file 'components.api'
--- components.api	2015-10-15 14:17:25 +0000
+++ components.api	2015-10-20 11:06:17 +0000
@@ -1363,7 +1363,6 @@
     property string name
     property QtObject palette
     readonly property ThemeSettings parentTheme
-    property ushort version
 Ubuntu.Components.ListItems.ThinDivider 1.0 0.1: Rectangle
 Ubuntu.Components.ListItems.ThinDivider 1.3: Rectangle
 Ubuntu.Components.ToolbarButton 1.0 0.1: StyledItem
@@ -1400,7 +1399,6 @@
 Ubuntu.Components.UCFontUtils 1.0 0.1: QtObject
     function double sizeToPixels(string size)
     function double modularScale(string size)
-UCItemAttached: QtObject
 UCListItemDivider: Item
     property color colorFrom
     property color colorTo

=== modified file 'src/Ubuntu/Components/1.2/MainViewBase.qml'
--- src/Ubuntu/Components/1.2/MainViewBase.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/MainViewBase.qml	2015-10-20 11:06:17 +0000
@@ -48,12 +48,12 @@
 
           Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
          */
-        property string theme: (ColorUtils.luminance(backgroundColor) >= 0.85) ?
+        property string themeName: (ColorUtils.luminance(backgroundColor) >= 0.85) ?
                                    "Ambiance" : "SuruDark"
-        onThemeChanged: {
+        onThemeNameChanged: {
             // only change the theme if the current one is a system one.
-            if (theme !== "" && (Theme.name.search("Ubuntu.Components.Themes") >= 0)) {
-                Theme.name = "Ubuntu.Components.Themes.%1".arg(theme);
+            if (themeName !== "" && (Theme.name.search("Ubuntu.Components.Themes") >= 0)) {
+                Theme.name = "Ubuntu.Components.Themes.%1".arg(themeName);
             }
         }
     }

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-10-16 11:22:54 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-10-20 11:06:17 +0000
@@ -717,7 +717,6 @@
                 height: body.headerHeight
 
                 styleName: "PageHeadStyle"
-                theme.version: Ubuntu.toolkitVersion
                 objectName: "Header" + column
 
                 property real preferredHeight: subHeader.__styleInstance ?

=== modified file 'src/Ubuntu/Components/1.3/AnimatedItem.qml'
--- src/Ubuntu/Components/1.3/AnimatedItem.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/AnimatedItem.qml	2015-10-20 11:06:17 +0000
@@ -25,14 +25,13 @@
 */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.3 as Toolkit
+import Ubuntu.Components 1.3
 
-Toolkit.StyledItem {
+StyledItem {
     id: root
     /*!
       \deprecated
       Specifies whether the component is on the visible area of the Flickable or not.
     */
-    theme.version: Toolkit.Ubuntu.toolkitVersion
     property bool onScreen: true
 }

=== modified file 'src/Ubuntu/Components/1.3/AppHeader.qml'
--- src/Ubuntu/Components/1.3/AppHeader.qml	2015-10-01 21:23:04 +0000
+++ src/Ubuntu/Components/1.3/AppHeader.qml	2015-10-20 11:06:17 +0000
@@ -151,6 +151,5 @@
         }
     }
 
-    theme.version: Components.Ubuntu.toolkitVersion
     styleName: "PageHeadStyle"
 }

=== modified file 'src/Ubuntu/Components/1.3/Button.qml'
--- src/Ubuntu/Components/1.3/Button.qml	2015-08-20 06:56:44 +0000
+++ src/Ubuntu/Components/1.3/Button.qml	2015-10-20 11:06:17 +0000
@@ -121,6 +121,5 @@
     */
     property string iconPosition: "left"
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "ButtonStyle"
 }

=== modified file 'src/Ubuntu/Components/1.3/CheckBox.qml'
--- src/Ubuntu/Components/1.3/CheckBox.qml	2015-09-16 16:58:51 +0000
+++ src/Ubuntu/Components/1.3/CheckBox.qml	2015-10-20 11:06:17 +0000
@@ -49,6 +49,5 @@
      */
     onTriggered: checked = !checked
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "CheckBoxStyle"
 }

=== modified file 'src/Ubuntu/Components/1.3/OptionSelector.qml'
--- src/Ubuntu/Components/1.3/OptionSelector.qml	2015-09-07 10:05:58 +0000
+++ src/Ubuntu/Components/1.3/OptionSelector.qml	2015-10-20 11:06:17 +0000
@@ -225,7 +225,6 @@
                 right: parent.right
             }
             state: optionSelector.expanded ? "expanded" : "collapsed"
-            theme.version: Toolkit.Ubuntu.toolkitVersion
             styleName: "OptionSelectorStyle"
             states: [ State {
                     name: "expanded"

=== modified file 'src/Ubuntu/Components/1.3/PageTreeNode.qml'
--- src/Ubuntu/Components/1.3/PageTreeNode.qml	2015-10-14 19:18:58 +0000
+++ src/Ubuntu/Components/1.3/PageTreeNode.qml	2015-10-20 11:06:17 +0000
@@ -148,6 +148,4 @@
             node.parentNode = internal.getParentPageTreeNode(node);
         }
     }
-
-    theme.version: Toolkit.Ubuntu.toolkitVersion
 }

=== modified file 'src/Ubuntu/Components/1.3/ProgressBar.qml'
--- src/Ubuntu/Components/1.3/ProgressBar.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/ProgressBar.qml	2015-10-20 11:06:17 +0000
@@ -70,6 +70,5 @@
     */
     property bool showProgressPercentage: true
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "ProgressBarStyle"
 }

=== modified file 'src/Ubuntu/Components/1.3/PullToRefresh.qml'
--- src/Ubuntu/Components/1.3/PullToRefresh.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/PullToRefresh.qml	2015-10-20 11:06:17 +0000
@@ -222,7 +222,6 @@
       */
     signal refresh()
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "PullToRefreshStyle"
     implicitHeight: __styleInstance.implicitHeight
     anchors {

=== modified file 'src/Ubuntu/Components/1.3/Scrollbar.qml'
--- src/Ubuntu/Components/1.3/Scrollbar.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/Scrollbar.qml	2015-10-20 11:06:17 +0000
@@ -146,6 +146,5 @@
         }
     }
 
-    theme.version: Toolkit.Ubuntu.toolkitVersion
     styleName: "ScrollbarStyle"
 }

=== modified file 'src/Ubuntu/Components/1.3/Sections.qml'
--- src/Ubuntu/Components/1.3/Sections.qml	2015-07-14 12:49:58 +0000
+++ src/Ubuntu/Components/1.3/Sections.qml	2015-10-20 11:06:17 +0000
@@ -29,7 +29,6 @@
 StyledItem {
     id: sections
     styleName: "SectionsStyle"
-    theme.version: Ubuntu.toolkitVersion
 
     /*!
       List of actions that represent the sections.

=== modified file 'src/Ubuntu/Components/1.3/Slider.qml'
--- src/Ubuntu/Components/1.3/Slider.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/Slider.qml	2015-10-20 11:06:17 +0000
@@ -206,6 +206,5 @@
         onLiveValueChanged: if (isPressed) slider.requestFocus(Qt.MouseFocusReason)
     }
 
-    theme.version: Toolkit.Ubuntu.toolkitVersion
     styleName: "SliderStyle"
 }

=== modified file 'src/Ubuntu/Components/1.3/TabBar.qml'
--- src/Ubuntu/Components/1.3/TabBar.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/TabBar.qml	2015-10-20 11:06:17 +0000
@@ -97,7 +97,6 @@
 
     implicitHeight: units.gu(7.5)
     activeFocusOnPress: true
-    theme.version: Toolkit.Ubuntu.toolkitVersion
     styleName: "TabBarStyle"
 
     QtObject {

=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
--- src/Ubuntu/Components/1.3/TextArea.qml	2015-09-07 10:05:58 +0000
+++ src/Ubuntu/Components/1.3/TextArea.qml	2015-10-20 11:06:17 +0000
@@ -886,6 +886,5 @@
         }
     }
 
-    theme.version: Ubuntu.Ubuntu.toolkitVersion
     styleName: "TextAreaStyle"
 }

=== modified file 'src/Ubuntu/Components/1.3/TextCursor.qml'
--- src/Ubuntu/Components/1.3/TextCursor.qml	2015-08-11 17:15:59 +0000
+++ src/Ubuntu/Components/1.3/TextCursor.qml	2015-10-20 11:06:17 +0000
@@ -41,7 +41,6 @@
                                            handler.main.cursorDelegate :
                                            __styleInstance.cursorDelegate
 
-    theme.version: Ubuntu.Ubuntu.toolkitVersion
     styleName: "TextCursorStyle"
 
     objectName: "textCursor"

=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-09-07 10:05:58 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2015-10-20 11:06:17 +0000
@@ -1013,6 +1013,5 @@
         cursorPosition = 0;
     }
 
-    theme.version: Ubuntu.Ubuntu.toolkitVersion
     styleName: "TextFieldStyle"
 }

=== modified file 'src/Ubuntu/Components/1.3/TextInputPopover.qml'
--- src/Ubuntu/Components/1.3/TextInputPopover.qml	2015-09-16 05:28:29 +0000
+++ src/Ubuntu/Components/1.3/TextInputPopover.qml	2015-10-20 11:06:17 +0000
@@ -86,7 +86,6 @@
                 width: Math.max(units.gu(5), implicitWidth) + units.gu(2)
                 height: units.gu(6)
                 action: actions[modelData]
-                theme.version: Ubuntu.toolkitVersion
                 styleName: "ToolbarButtonStyle"
             }
         }

=== modified file 'src/Ubuntu/Components/1.3/Toolbar.qml'
--- src/Ubuntu/Components/1.3/Toolbar.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/Toolbar.qml	2015-10-20 11:06:17 +0000
@@ -135,7 +135,6 @@
         property bool opened: toolbar.opened
         property bool animating: toolbar.animating
 
-        theme.version: Toolkit.Ubuntu.toolkitVersion
         styleName: "ToolbarStyle"
     }
 

=== modified file 'src/Ubuntu/Components/1.3/ToolbarButton.qml'
--- src/Ubuntu/Components/1.3/ToolbarButton.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/ToolbarButton.qml	2015-10-20 11:06:17 +0000
@@ -84,6 +84,5 @@
     height: parent ? parent.height : undefined
     width: units.gu(5)
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "ToolbarButtonStyle"
 }

=== modified file 'src/Ubuntu/Components/ListItems/1.3/ItemSelector.qml'
--- src/Ubuntu/Components/ListItems/1.3/ItemSelector.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/ListItems/1.3/ItemSelector.qml	2015-10-20 11:06:17 +0000
@@ -216,7 +216,6 @@
                 right: parent.right
             }
             state: itemSelector.expanded ? "expanded" : "collapsed"
-            theme.version: Ubuntu.toolkitVersion
             styleName: "ListItemOptionSelectorStyle"
 
             states: [ State {

=== modified file 'src/Ubuntu/Components/ListItems/1.3/ProgressionVisual.qml'
--- src/Ubuntu/Components/ListItems/1.3/ProgressionVisual.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/ListItems/1.3/ProgressionVisual.qml	2015-10-20 11:06:17 +0000
@@ -25,6 +25,5 @@
     property bool showSplit: false
     property real splitMargin
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "ProgressionVisualStyle"
 }

=== modified file 'src/Ubuntu/Components/Pickers/1.3/DatePicker.qml'
--- src/Ubuntu/Components/Pickers/1.3/DatePicker.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/Pickers/1.3/DatePicker.qml	2015-10-20 11:06:17 +0000
@@ -420,7 +420,6 @@
         }
     }
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "DatePickerStyle"
     Binding {
         target: __styleInstance

=== modified file 'src/Ubuntu/Components/Pickers/1.3/Dialer.qml'
--- src/Ubuntu/Components/Pickers/1.3/Dialer.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/Pickers/1.3/Dialer.qml	2015-10-20 11:06:17 +0000
@@ -145,7 +145,6 @@
     implicitHeight: size
     activeFocusOnPress: true
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "DialerStyle"
 
     Item {

=== modified file 'src/Ubuntu/Components/Pickers/1.3/DialerHand.qml'
--- src/Ubuntu/Components/Pickers/1.3/DialerHand.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/Pickers/1.3/DialerHand.qml	2015-10-20 11:06:17 +0000
@@ -143,7 +143,6 @@
     width: parent.width
     height: parent.height
     activeFocusOnPress: true
-    theme.version: Ubuntu.toolkitVersion
     styleName: "DialerHandStyle"
 
     /*! \internal */

=== modified file 'src/Ubuntu/Components/Pickers/1.3/Picker.qml'
--- src/Ubuntu/Components/Pickers/1.3/Picker.qml	2015-09-24 20:05:52 +0000
+++ src/Ubuntu/Components/Pickers/1.3/Picker.qml	2015-10-20 11:06:17 +0000
@@ -165,7 +165,6 @@
 
     activeFocusOnPress: true
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "PickerStyle"
 
     /*! \internal */

=== modified file 'src/Ubuntu/Components/Pickers/1.3/PickerDelegate.qml'
--- src/Ubuntu/Components/Pickers/1.3/PickerDelegate.qml	2015-09-24 20:05:52 +0000
+++ src/Ubuntu/Components/Pickers/1.3/PickerDelegate.qml	2015-10-20 11:06:17 +0000
@@ -45,7 +45,6 @@
         internal.itemList.currentIndex = index;
     }
 
-    theme.version: Ubuntu.toolkitVersion
     styleName: "PickerDelegateStyle"
 
     QtObject {

=== modified file 'src/Ubuntu/Components/Popups/1.3/Dialog.qml'
--- src/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-09-21 14:44:13 +0000
+++ src/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-10-20 11:06:17 +0000
@@ -213,7 +213,6 @@
             }
         }
 
-        theme.version: Ubuntu.toolkitVersion
         styleName: "DialogForegroundStyle"
     }
 }

=== modified file 'src/Ubuntu/Components/Popups/1.3/Popover.qml'
--- src/Ubuntu/Components/Popups/1.3/Popover.qml	2015-08-12 19:53:20 +0000
+++ src/Ubuntu/Components/Popups/1.3/Popover.qml	2015-10-20 11:06:17 +0000
@@ -241,7 +241,6 @@
         signal showCompleted()
         signal hideCompleted()
 
-        theme.version: Ubuntu.toolkitVersion
         styleName: "PopoverForegroundStyle"
     }
 

=== modified file 'src/Ubuntu/Components/Popups/1.3/SheetBase.qml'
--- src/Ubuntu/Components/Popups/1.3/SheetBase.qml	2015-05-22 13:54:38 +0000
+++ src/Ubuntu/Components/Popups/1.3/SheetBase.qml	2015-10-20 11:06:17 +0000
@@ -109,7 +109,6 @@
             }
         }
 
-        theme.version: Ubuntu.toolkitVersion
         styleName: "SheetForegroundStyle"
     }
 }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.2/OptionSelectorStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.2/OptionSelectorStyle.qml	2015-04-24 14:52:19 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.2/OptionSelectorStyle.qml	2015-10-20 11:06:17 +0000
@@ -20,6 +20,7 @@
 
 Item {
     id: ambianceStyle
+    objectName: "OptionSelector12"
 
     property url chevron: Qt.resolvedUrl("../artwork/chevron_down.png")
     property url tick: Qt.resolvedUrl("../artwork/tick.png")

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml	2015-07-22 13:14:43 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/OptionSelectorStyle.qml	2015-10-20 11:06:17 +0000
@@ -20,6 +20,7 @@
 
 Item {
     id: ambianceStyle
+    objectName: "OptionSelector13"
 
     property url chevron: Qt.resolvedUrl("../artwork/chevron_down.png")
     property url tick: Qt.resolvedUrl("../artwork/tick.png")

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-10-01 12:34:29 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-10-20 11:06:17 +0000
@@ -230,7 +230,6 @@
     qmlRegisterType<UCUbuntuShapeOverlay>(uri, 1, 2, "UbuntuShapeOverlay");
 
     // register 1.3 API
-    qmlRegisterType<UCItemAttached>();
     qmlRegisterType<UCListItem, 1>(uri, 1, 3, "ListItem");
     qmlRegisterType<UCListItemExpansion>();
     qmlRegisterType<UCTheme>(uri, 1, 3, "ThemeSettings");

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-10-01 08:47:31 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-10-20 11:06:17 +0000
@@ -91,7 +91,8 @@
     $$PWD/ucheader.h \
     $$PWD/uclabel.h \
     $$PWD/uclistitemlayout.h \
-    $$PWD/privates/threelabelsslot_p.h
+    $$PWD/privates/threelabelsslot_p.h \
+    $$PWD/ucimportversionchecker_p.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \
@@ -153,7 +154,8 @@
     $$PWD/ucheader.cpp \
     $$PWD/uclabel.cpp \
     $$PWD/uclistitemlayout.cpp \
-    $$PWD/privates/threelabelsslot_p.cpp
+    $$PWD/privates/threelabelsslot_p.cpp \
+    $$PWD/ucimportversionchecker_p.cpp
 
 # adapters
 SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp

=== added file 'src/Ubuntu/Components/plugin/ucimportversionchecker_p.cpp'
--- src/Ubuntu/Components/plugin/ucimportversionchecker_p.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucimportversionchecker_p.cpp	2015-10-20 11:06:17 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#include "ucimportversionchecker_p.h"
+#include "ucnamespace.h"
+
+#include <QtQuick>
+#include <QtQml/private/qqmldata_p.h>
+#include <QtQml/private/qqmlcontext_p.h>
+#include <QtQml/private/qqmlpropertycache_p.h>
+#include <QtQml/private/qqmlmetatype_p.h>
+
+/*!
+ * \internal
+ *
+ * The function returns the version the module is imported with based on a QML
+ * component instance. It only checks till reaches 1.2 version. Implementations
+ * must implement the propertyForVersion method and must probvide a property for
+ * each version requested.
+ */
+quint16 UCImportVersionChecker::importVersion(QObject *object)
+{
+    QQmlData *data = QQmlData::get(object);
+    Q_ASSERT(data);
+    QQmlContextData *cdata = QQmlContextData::get(qmlContext(object));
+    Q_ASSERT(cdata);
+    QQmlEngine *engine = qmlEngine(object);
+    Q_ASSERT(engine);
+
+    // start from the highest available version till we reach 1.2
+    for (quint16 minor = MINOR_VERSION(LATEST_UITK_VERSION); minor > 2; minor--) {
+        quint16 version = BUILD_VERSION(1, minor);
+        const QString property(propertyForVersion(version));
+        Q_ASSERT(!property.isEmpty());
+        QQmlPropertyData l;
+        QQmlPropertyData *p = QQmlPropertyCache::property(engine, object, property, cdata, l);
+        if (data->propertyCache->isAllowedInRevision(p)) {
+            return version;
+        }
+    }
+    // if none found, simply fall back to 1.2
+    return BUILD_VERSION(1, 2);
+}

=== added file 'src/Ubuntu/Components/plugin/ucimportversionchecker_p.h'
--- src/Ubuntu/Components/plugin/ucimportversionchecker_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucimportversionchecker_p.h	2015-10-20 11:06:17 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UCIMPORTVERSIONCHECKER_P_H
+#define UCIMPORTVERSIONCHECKER_P_H
+
+#include <QtCore>
+
+class UCImportVersionChecker
+{
+public:
+    UCImportVersionChecker() {}
+
+    virtual QString propertyForVersion(quint16 version) const = 0;
+
+    virtual quint16 importVersion(QObject *object);
+};
+
+#endif // UCIMPORTVERSIONCHECKER_P_H

=== modified file 'src/Ubuntu/Components/plugin/uclabel.cpp'
--- src/Ubuntu/Components/plugin/uclabel.cpp	2015-09-28 16:18:19 +0000
+++ src/Ubuntu/Components/plugin/uclabel.cpp	2015-10-20 11:06:17 +0000
@@ -78,6 +78,7 @@
  */
 UCLabel::UCLabel(QQuickItem* parent)
     : QQuickText(parent)
+    , UCThemingExtension(this)
     , m_textSize(Medium)
     , m_flags(0)
 {
@@ -91,7 +92,6 @@
 
 void UCLabel::init()
 {
-    initTheming(this);
     postThemeChanged();
     updatePixelSize();
     m_defaultFont = font();
@@ -103,13 +103,6 @@
     connect(this, &UCLabel::colorChanged, this, &UCLabel::_q_customColor, Qt::DirectConnection);
 }
 
-void UCLabel::customEvent(QEvent *event)
-{
-    if (UCThemeEvent::isThemeEvent(event)) {
-        handleThemeEvent(static_cast<UCThemeEvent*>(event));
-    }
-}
-
 void UCLabel::postThemeChanged()
 {
     if (m_flags & ColorSet) {

=== modified file 'src/Ubuntu/Components/plugin/uclabel.h'
--- src/Ubuntu/Components/plugin/uclabel.h	2015-10-01 12:34:29 +0000
+++ src/Ubuntu/Components/plugin/uclabel.h	2015-10-20 11:06:17 +0000
@@ -23,7 +23,7 @@
 class UCLabel : public QQuickText, public UCThemingExtension
 {
     Q_OBJECT
-
+    Q_INTERFACES(UCThemingExtension)
     Q_ENUMS(TextSize)
     Q_PROPERTY(TextSize textSize MEMBER m_textSize WRITE setTextSize NOTIFY textSizeChanged FINAL)
 
@@ -61,7 +61,6 @@
 protected:
     // from QQuickItem
     void classBegin();
-    void customEvent(QEvent *event);
 
     // from UCItemExtension
     void preThemeChanged(){}

=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2015-10-12 14:32:17 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2015-10-20 11:06:17 +0000
@@ -61,7 +61,7 @@
     QColor colorFrom;
     QColor colorTo;
     QGradientStops gradient;
-    UCListItemPrivate *listItem;
+    UCListItem *listItem;
 };
 
 UCListItemDivider::UCListItemDivider(UCListItem *parent)
@@ -77,14 +77,16 @@
 {
     Q_D(UCListItemDivider);
     QQml_setParent_noEvent(this, listItem);
-    d->listItem = UCListItemPrivate::get(listItem);
+    d->listItem = listItem;
     setParentItem(listItem);
     // anchor to left/right/bottom of the ListItem
     QQuickAnchors *anchors = d->anchors();
-    anchors->setLeft(d->listItem->left());
-    anchors->setRight(d->listItem->right());
-    anchors->setBottom(d->listItem->bottom());
+    UCListItemPrivate *pListItem = UCListItemPrivate::get(listItem);
+    anchors->setLeft(pListItem->left());
+    anchors->setRight(pListItem->right());
+    anchors->setBottom(pListItem->bottom());
     // connect visible change so we relayout contentItem
+    // FIXME: do this with itemChange!!!
     connect(this, SIGNAL(visibleChanged()), listItem, SLOT(_q_relayout()));
 }
 
@@ -132,7 +134,8 @@
         dividerNode = d->sceneGraphContext()->createRectangleNode();
     }
 
-    bool lastItem = d->listItem->countOwner ? (d->listItem->index() == (d->listItem->countOwner->property("count").toInt() - 1)): false;
+    UCListItemPrivate *pListItem = UCListItemPrivate::get(d->listItem);
+    bool lastItem = pListItem->countOwner ? (pListItem->index() == (pListItem->countOwner->property("count").toInt() - 1)): false;
     if (!lastItem && (d->gradient.size() > 0) && ((d->colorFrom.alphaF() >= (1.0f / 255.0f)) || (d->colorTo.alphaF() >= (1.0f / 255.0f)))) {
         dividerNode->setRect(boundingRect());
         dividerNode->setGradientStops(d->gradient);
@@ -1174,7 +1177,7 @@
 {
     Q_Q(UCListItem);
     // themes 1.2 and below should not have context menu support, so leave
-    quint16 version(getTheme()->version());
+    quint16 version(importVersion(q));
     if (version <= BUILD_VERSION(1, 2)) {
         return;
     }
@@ -1643,7 +1646,7 @@
 {
     Q_D(UCListItem);
     d->customColor = false;
-    d->highlightColor = d->getTheme()->getPaletteColor("selected", "background");
+    d->highlightColor = getTheme()->getPaletteColor("selected", "background");
     update();
     Q_EMIT highlightColorChanged();
 }

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-10-06 07:16:37 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-10-20 11:06:17 +0000
@@ -28,7 +28,7 @@
 UCStyledItemBasePrivate::UCStyledItemBasePrivate()
     : styleComponent(Q_NULLPTR)
     , styleItem(Q_NULLPTR)
-    , styleVersion(LATEST_UITK_VERSION)
+    , styleVersion(0)
     , activeFocusOnPress(false)
     , wasStyleLoaded(false)
 {
@@ -108,6 +108,7 @@
  */
 UCStyledItemBase::UCStyledItemBase(QQuickItem *parent)
     : QQuickItem(*(new UCStyledItemBasePrivate), parent)
+    , UCThemingExtension(this)
 {
     Q_D(UCStyledItemBase);
     d->init();
@@ -115,6 +116,7 @@
 
 UCStyledItemBase::UCStyledItemBase(UCStyledItemBasePrivate &dd, QQuickItem *parent)
     : QQuickItem(dd, parent)
+    , UCThemingExtension(this)
 {
     Q_D(UCStyledItemBase);
     d->init();
@@ -308,7 +310,7 @@
     // either styleComponent or styleName is valid
     QQmlComponent *component = styleComponent;
     if (!component) {
-        component = getTheme()->createStyleComponent(styleDocument + ".qml", q, styleVersion);
+        component = q->getTheme()->createStyleComponent(styleDocument + ".qml", q, styleVersion);
     }
     if (!component) {
         return false;
@@ -442,41 +444,38 @@
  * if any, or to the system default theme.
  */
 
-void UCStyledItemBasePrivate::preThemeChanged()
+void UCStyledItemBase::preThemeChanged()
 {
-    wasStyleLoaded = (styleItem != Q_NULLPTR);
-    preStyleChanged();
+    Q_D(UCStyledItemBase);
+    d->wasStyleLoaded = (d->styleItem != Q_NULLPTR);
+    d->preStyleChanged();
 }
-void UCStyledItemBasePrivate::postThemeChanged()
+void UCStyledItemBase::postThemeChanged()
 {
-    Q_EMIT q_func()->themeChanged();
-    if (!wasStyleLoaded) {
+    Q_EMIT themeChanged();
+    Q_D(UCStyledItemBase);
+    if (!d->wasStyleLoaded) {
         return;
     }
-    postStyleChanged();
-    loadStyleItem();
+    d->postStyleChanged();
+    d->loadStyleItem();
 }
 
-void UCStyledItemBase::classBegin()
+QString UCStyledItemBasePrivate::propertyForVersion(quint16 version) const
 {
-    QQuickItem::classBegin();
-    d_func()->initTheming(this);
+    switch (MINOR_VERSION(version)) {
+    case 3: return QStringLiteral("theme");
+    default: return QString();
+    }
 }
 
 void UCStyledItemBase::componentComplete()
 {
     QQuickItem::componentComplete();
     Q_D(UCStyledItemBase);
-
-    QQmlData *data = QQmlData::get(this);
-    QQmlContextData *cdata = QQmlContextData::get(qmlContext(this));
-    QQmlPropertyData l;
-    QQmlPropertyData *pdata = QQmlPropertyCache::property(qmlEngine(this), this, QStringLiteral("theme"), cdata, l);
-    // FIXME MainView internal styler uses theme property, meaning imports13 will be true,
-    // therefore we must check the type of the property as well in case anyone else overrides it
-    d->styleVersion = data->propertyCache->isAllowedInRevision(pdata) && (property("theme").type() != QVariant::String)
-            ? BUILD_VERSION(1, 3)
-            : BUILD_VERSION(1, 2);
+    // make sure the theme version is up to date
+    d->styleVersion = d->importVersion(this);
+    UCTheme::checkMixedVersionImports(d->styleVersion);
     // no animation at this time
     // prepare style context if not been done yet
     d->postStyleChanged();
@@ -509,13 +508,4 @@
     return QQuickItem::childMouseEventFilter(child, event);
 }
 
-// catch UCThemeEvent
-void UCStyledItemBase::customEvent(QEvent *event)
-{
-    Q_D(UCStyledItemBase);
-    if (UCThemeEvent::isThemeEvent(event)) {
-        d->handleThemeEvent(static_cast<UCThemeEvent*>(event));
-    }
-}
-
 #include "moc_ucstyleditembase.cpp"

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase.h	2015-09-14 11:26:44 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase.h	2015-10-20 11:06:17 +0000
@@ -20,20 +20,22 @@
 #define UCSTYLEDITEMBASE_H
 
 #include <QtQuick/QQuickItem>
+#include "ucthemingextension.h"
 
 class UCStyledItemBasePrivate;
 class UCTheme;
 class UCStyleHints;
-class UCStyledItemBase : public QQuickItem
+class UCStyledItemBase : public QQuickItem, public UCThemingExtension
 {
     Q_OBJECT
+    Q_INTERFACES(UCThemingExtension)
     Q_PROPERTY(bool activeFocusOnPress
                READ activefocusOnPress WRITE setActiveFocusOnPress
                NOTIFY activeFocusOnPressChanged REVISION 1)
     Q_PRIVATE_PROPERTY(UCStyledItemBase::d_func(), QQmlComponent *style READ style WRITE setStyle RESET resetStyle NOTIFY styleChanged FINAL DESIGNABLE false)
     Q_PRIVATE_PROPERTY(UCStyledItemBase::d_func(), QQuickItem *__styleInstance READ styleInstance NOTIFY styleInstanceChanged FINAL DESIGNABLE false)
     Q_PRIVATE_PROPERTY(UCStyledItemBase::d_func(), QString styleName READ styleName WRITE setStyleName NOTIFY styleNameChanged FINAL REVISION 2)
-    Q_PRIVATE_PROPERTY(d_func(), UCTheme *theme READ getTheme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL REVISION 2)
+    Q_PROPERTY(UCTheme *theme READ getTheme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL REVISION 2)
 public:
     explicit UCStyledItemBase(QQuickItem *parent = 0);
 
@@ -53,11 +55,13 @@
 protected:
     UCStyledItemBase(UCStyledItemBasePrivate &, QQuickItem *parent);
 
-    void classBegin();
+    // from UCThemingExtension interface
+    virtual void preThemeChanged();
+    virtual void postThemeChanged();
+
     void componentComplete();
     void mousePressEvent(QMouseEvent *event);
     bool childMouseEventFilter(QQuickItem *child, QEvent *event);
-    void customEvent(QEvent *event);
 
 private:
     Q_DECLARE_PRIVATE(UCStyledItemBase)

=== modified file 'src/Ubuntu/Components/plugin/ucstyleditembase_p.h'
--- src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-10-06 07:16:37 +0000
+++ src/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-10-20 11:06:17 +0000
@@ -22,11 +22,13 @@
 #include <QtQuick/private/qquickitem_p.h>
 #include "ucstyleditembase.h"
 #include "ucthemingextension.h"
+#include "ucimportversionchecker_p.h"
 
 class QQuickMouseArea;
 class UCStyledItemBase;
-class UCStyledItemBasePrivate : public QQuickItemPrivate, public UCThemingExtension
+class UCStyledItemBasePrivate : public QQuickItemPrivate, public UCImportVersionChecker
 {
+    Q_INTERFACES(UCThemingExtension)
     Q_DECLARE_PUBLIC(UCStyledItemBase)
 public:
 
@@ -55,8 +57,8 @@
     virtual void postStyleChanged() {}
     virtual bool loadStyleItem(bool animated = true);
 
-    virtual void preThemeChanged();
-    virtual void postThemeChanged();
+    // from UCImportVersionChecker
+    virtual QString propertyForVersion(quint16 version) const;
 
 public:
 

=== modified file 'src/Ubuntu/Components/plugin/uctheme.cpp'
--- src/Ubuntu/Components/plugin/uctheme.cpp	2015-09-21 13:29:17 +0000
+++ src/Ubuntu/Components/plugin/uctheme.cpp	2015-10-20 11:06:17 +0000
@@ -44,6 +44,8 @@
 #include <QtQml/private/qqmlbinding_p.h>
 #undef foreach
 
+
+quint16 UCTheme::previousVersion = 0;
 /*!
  * \qmltype ThemeSettings
  * \instantiates UCTheme
@@ -345,7 +347,6 @@
     : QObject(parent)
     , m_palette(UCTheme::defaultTheme().m_palette)
     , m_engine(UCTheme::defaultTheme().m_engine)
-    , m_version(UCTheme::defaultTheme().m_version)
     , m_defaultStyle(false)
 {
     init();
@@ -355,7 +356,6 @@
     : QObject(parent)
     , m_palette(NULL)
     , m_engine(NULL)
-    , m_version(LATEST_UITK_VERSION)
     , m_defaultStyle(defaultStyle)
 {
     init();
@@ -460,6 +460,7 @@
     }
     loadPalette();
     Q_EMIT nameChanged();
+    updateThemedItems();
 }
 void UCTheme::resetName()
 {
@@ -625,52 +626,39 @@
 
 void UCTheme::attachItem(QQuickItem *item, bool attach)
 {
-    UCItemAttached *theming = static_cast<UCItemAttached*>(qmlAttachedPropertiesObject<UCItemAttached>(item, false));
-    if (!theming) {
-        return;
-    }
     if (attach) {
-        connect(this, SIGNAL(nameChanged()), theming, SLOT(reloadTheme()), Qt::DirectConnection);
-        connect(this, SIGNAL(versionChanged()), theming, SLOT(reloadTheme()), Qt::DirectConnection);
+        m_attachedItems.append(item);
     } else {
-        disconnect(this, SIGNAL(nameChanged()), theming, SLOT(reloadTheme()));
-        disconnect(this, SIGNAL(versionChanged()), theming, SLOT(reloadTheme()));
-    }
-}
-
-/*!
- * \qmlproperty uint16 ThemeSettings::version
- * \since Ubuntu.Components 1.3
- * The property specifies the version of the toolkit the component is declared.
- * This equivalent with the toolkit version the component document imports. Themes,
- * starting of version 1.3, should follow the same versioning as the toolkit does.
- * If a component's style is not found under the given version, styling will try
- * to locate the style with a lower minor version until it finds a match.
- *
- * The current version of an imported toolkit module is reported by the
- * \l Ubuntu::toolkitVersion property. If a document imports Ubuntu.Components 1.2,
- * the components will load the system or application themes associated to that
- * version, and \l Ubuntu::toolkitVersion will report that version. If the document
- * imports 1.3 version, the components will load 1.3 themes. Setting this property
- * will initiate a full theme reload.
- *
- * Usually developers do not need to set this property on toolkit components as
- * those already set the version. However themes provided by applications should
- * take care of versioning the styles and on how to do theming.
- *
- * \sa Ubuntu::toolkitVersion, Ubuntu::version, {Themes}
+        m_attachedItems.removeOne(item);
+    }
+}
+
+void UCTheme::updateThemedItems()
+{
+    for (int i = 0; i < m_attachedItems.count(); i++) {
+        UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(m_attachedItems[i]);
+        if (extension) {
+            extension->itemThemeReloaded(this);
+        }
+    }
+}
+
+/*
+ * Updates the version used by the toolkit/application
  */
-quint16 UCTheme::version()
-{
-    return m_version;
-}
-void UCTheme::setVersion(quint16 version)
-{
-    if (m_version == version) {
-        return;
+void UCTheme::checkMixedVersionImports(quint16 version)
+{
+    if (version != previousVersion && previousVersion) {
+        // the first change is due to the first import detection, any further changes would mean there are
+        // multiple version imports
+        QString msg = QStringLiteral("Mixing of Ubuntu.Components module versions %1.%2 and %3.%4 detected!")
+                .arg(MAJOR_VERSION(version))
+                .arg(MINOR_VERSION(version))
+                .arg(MAJOR_VERSION(previousVersion))
+                .arg(MINOR_VERSION(previousVersion));
+        qWarning() << msg;
     }
-    m_version = version;
-    Q_EMIT versionChanged();
+    previousVersion = version;
 }
 
 /*
@@ -680,10 +668,7 @@
 QQmlComponent* UCTheme::createStyleComponent(const QString& styleName, QObject* parent, quint16 version)
 {
     QQmlComponent *component = NULL;
-
-    if (!version) {
-        version = m_version;
-    }
+    Q_ASSERT(version);
 
     if (parent != NULL) {
         QQmlEngine* engine = qmlEngine(parent);
@@ -732,7 +717,7 @@
         m_palette = 0;
     }
     // theme may not have palette defined
-    QUrl paletteUrl = styleUrl("Palette.qml", m_version);
+    QUrl paletteUrl = styleUrl("Palette.qml", previousVersion ? previousVersion : LATEST_UITK_VERSION);
     if (paletteUrl.isValid()) {
         m_palette = QuickUtils::instance().createQmlObject(paletteUrl, m_engine);
         if (m_palette) {

=== modified file 'src/Ubuntu/Components/plugin/uctheme.h'
--- src/Ubuntu/Components/plugin/uctheme.h	2015-09-21 07:21:36 +0000
+++ src/Ubuntu/Components/plugin/uctheme.h	2015-10-20 11:06:17 +0000
@@ -28,6 +28,8 @@
 #include <QtQml/QQmlParserStatus>
 #include <QtQml/QQmlProperty>
 
+#include <QtQml/private/qpodvector_p.h>
+
 #include "ucdefaulttheme.h"
 
 class UCStyledItemBase;
@@ -40,8 +42,9 @@
     Q_PROPERTY(UCTheme *parentTheme READ parentTheme NOTIFY parentThemeChanged FINAL)
     Q_PROPERTY(QString name READ name WRITE setName RESET resetName NOTIFY nameChanged FINAL)
     Q_PROPERTY(QObject* palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL)
-    Q_PROPERTY(quint16 version READ version WRITE setVersion NOTIFY versionChanged FINAL)
 public:
+
+    static quint16 previousVersion;
     struct ThemeRecord {
         ThemeRecord() :
             shared(false), deprecated(false)
@@ -75,8 +78,7 @@
     void resetName();
     QObject* palette();
     void setPalette(QObject *config);
-    quint16 version();
-    void setVersion(quint16 version);
+    static void checkMixedVersionImports(quint16 version);
 
     // internal, used by the deprecated Theme.createStyledComponent()
     QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent, quint16 version = 0);
@@ -110,6 +112,7 @@
     void updateThemePaths();
     QUrl styleUrl(const QString& styleName, quint16 version, bool *isFallback = NULL);
     void loadPalette(bool notify = true);
+    void updateThemedItems();
 
     class PaletteConfig
     {
@@ -161,8 +164,8 @@
     QPointer<QObject> m_palette; // the palette might be from the default style if the theme doesn't define palette
     QList<ThemeRecord> m_themePaths;
     UCDefaultTheme m_defaultTheme;
+    QPODVector<QQuickItem*, 4> m_attachedItems;
     QQmlEngine *m_engine;
-    quint16 m_version;
     bool m_defaultStyle:1;
     bool m_completed:1;
 

=== modified file 'src/Ubuntu/Components/plugin/ucthemingextension.cpp'
--- src/Ubuntu/Components/plugin/ucthemingextension.cpp	2015-09-21 14:24:05 +0000
+++ src/Ubuntu/Components/plugin/ucthemingextension.cpp	2015-10-20 11:06:17 +0000
@@ -23,103 +23,85 @@
 #include <QtGui/QGuiApplication>
 
 /*
- * The UCThemingExtension class provides theme handling on Items extending an existing
+ * The UCThemingExtension interface provides theme handling on Items extending an existing
  * QQuickItem derivate class. Items subject fo theming should derive from this class
- * and implement the virtual methods, as well as add the following two methods:
- * 1) classBegin(item) should be called from the QQuickItem::classBegin() method
- * 2) handleThemeEvent() should be called from QQuickItem::customEvent() method
+ * and implement the pure virtual methods.
  * The item can expose the theme property and use the getters defined by the
  * class.
- * Iin case the item exposes the theme property, it can use the getters from the
+ * In case the item exposes the theme property, it can use the getters from the
  * extension and declare the themeChanged signal.
  */
 
-static int themeUpdatedId = QEvent::registerEventType();
-static int themeReloadedId = QEvent::registerEventType();
-
-UCThemeEvent::UCThemeEvent(UCTheme *reloadedTheme)
-    : QEvent((QEvent::Type)themeReloadedId)
-    , m_oldTheme(Q_NULLPTR)
-    , m_newTheme(reloadedTheme)
-{
-    setAccepted(false);
-}
-
-UCThemeEvent::UCThemeEvent(UCTheme *oldTheme, UCTheme *newTheme)
-    : QEvent((QEvent::Type)themeUpdatedId)
-    , m_oldTheme(oldTheme)
-    , m_newTheme(newTheme)
-{
-    setAccepted(false);
-}
-
-UCThemeEvent::UCThemeEvent(const UCThemeEvent &other)
-    : QEvent(other.type())
-    , m_oldTheme(other.m_oldTheme)
-    , m_newTheme(other.m_newTheme)
-{
-    setAccepted(false);
-}
-
-bool UCThemeEvent::isThemeEvent(const QEvent *event)
-{
-    return ((int)event->type() == themeUpdatedId) || ((int)event->type() == themeReloadedId);
-}
-
-void UCThemingExtension::forwardEvent(QQuickItem *item, UCThemeEvent *event)
-{
-    Q_FOREACH(QQuickItem *child, item->childItems()) {
-        QGuiApplication::sendEvent(child, event);
-        // StyledItem will handle the broadcast itself depending on whether the theme change was appropriate or not
-        // and will complete the ascendantStyled/theme itself
-        if (child->childItems().size() > 0 && !UCItemAttached::isThemed(child)) {
-            forwardEvent(child, event);
-        }
-    }
-}
-
-void UCThemingExtension::broadcastThemeChange(QQuickItem *item, UCTheme *oldTheme, UCTheme *newTheme)
-{
-    UCThemeEvent event(oldTheme, newTheme);
-    forwardEvent(item, &event);
-}
-
-void UCThemingExtension::broadcastThemeReloaded(QQuickItem *item, UCTheme *theme)
-{
-    UCThemeEvent event(theme);
-    forwardEvent(item, &event);
+void notifyThemeChange(QQuickItem *item, UCTheme *oldTheme, UCTheme *newTheme)
+{
+    Q_FOREACH(QQuickItem *child, item->childItems()) {
+        UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(child);
+        if (extension) {
+            extension->itemThemeChanged(oldTheme, newTheme);
+        }
+        // StyledItem will handle the broadcast itself depending on whether the theme change was appropriate or not
+        // and will complete the ascendantStyled/theme itself
+        if (!extension) {
+            notifyThemeChange(child, oldTheme, newTheme);
+        }
+    }
+}
+
+void notifyThemeReloaded(QQuickItem *item, UCTheme *theme)
+{
+    Q_FOREACH(QQuickItem *child, item->childItems()) {
+        UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(child);
+        if (extension) {
+            extension->itemThemeReloaded(theme);
+        }
+        // StyledItem will handle the broadcast itself depending on whether the theme change was appropriate or not
+        // and will complete the ascendantStyled/theme itself
+        if (!extension) {
+            notifyThemeReloaded(child, theme);
+        }
+    }
 }
 
 /*************************************************************************
  * Attached to every Item in the system
  */
-UCItemAttached::UCItemAttached(QObject *owner)
-    : QObject(owner)
-    , m_item(static_cast<QQuickItem*>(owner))
+static uint xdata = QObject::registerUserData();
+class UCItemAttached : public QObjectUserData, public QQuickItemChangeListener
+{
+public:
+    explicit UCItemAttached(QQuickItem *owner = 0);
+    ~UCItemAttached();
+
+    QQuickItem *m_item;
+    QQuickItem *m_prevParent;
+
+    void itemParentChanged(QQuickItem *item, QQuickItem *newParent);
+
+private:
+
+    friend class UCThemingExtension;
+};
+
+UCItemAttached::UCItemAttached(QQuickItem *owner)
+    : m_item(owner)
     , m_prevParent(Q_NULLPTR)
-    , m_extension(Q_NULLPTR)
 {
-    // get parent item changes
-    connect(m_item, &QQuickItem::parentChanged, this, &UCItemAttached::handleParentChanged);
+    QQuickItemPrivate::get(m_item)->addItemChangeListener(this, QQuickItemPrivate::Parent);
 }
 
 UCItemAttached::~UCItemAttached()
 {
-}
-
-UCItemAttached *UCItemAttached::qmlAttachedProperties(QObject *owner)
-{
-    return new UCItemAttached(owner);
-}
-
-bool UCItemAttached::isThemed(QQuickItem *item)
-{
-    UCItemAttached *attached = static_cast<UCItemAttached*>(qmlAttachedPropertiesObject<UCItemAttached>(item, false));
-    return attached && (attached->m_extension != Q_NULLPTR);
+    QQuickItemPrivate::get(m_item)->removeItemChangeListener(this, QQuickItemPrivate::Parent);
+}
+
+bool UCThemingExtension::isThemed(QQuickItem *item)
+{
+    UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(item);
+    return extension != Q_NULLPTR;
 }
 
 // handle parent changes
-void UCItemAttached::handleParentChanged(QQuickItem *newParent)
+void UCItemAttached::itemParentChanged(QQuickItem *, QQuickItem *newParent)
 {
     if (newParent == m_prevParent || QQuickItemPrivate::get(m_item)->wasDeleted) {
         return;
@@ -128,41 +110,43 @@
     // make sure we have these handlers attached to each intermediate item
     QQuickItem *oldThemedAscendant = UCThemingExtension::ascendantThemed(m_prevParent);
     QQuickItem *newThemedAscendant = UCThemingExtension::ascendantThemed(newParent);
-    UCTheme *oldTheme = oldThemedAscendant ? oldThemedAscendant->property("theme").value<UCTheme*>() : &UCTheme::defaultTheme();
-    UCTheme *newTheme = newThemedAscendant ? newThemedAscendant->property("theme").value<UCTheme*>() : &UCTheme::defaultTheme();
+    UCThemingExtension *oldExtension = qobject_cast<UCThemingExtension*>(oldThemedAscendant);
+    UCThemingExtension *newExtension = qobject_cast<UCThemingExtension*>(newThemedAscendant);
+    UCTheme *oldTheme = oldExtension ? oldExtension->getTheme() : &UCTheme::defaultTheme();
+    UCTheme *newTheme = newExtension ? newExtension->getTheme() : &UCTheme::defaultTheme();
 
     if (oldTheme != newTheme) {
+        UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(m_item);
         // send the event to m_item first
-        UCThemeEvent event(oldTheme, newTheme);
-        if (m_extension) {
+        if (extension) {
             // only items with extensions should get this event
-            m_extension->handleThemeEvent(&event);
+            extension->itemThemeChanged(oldTheme, newTheme);
         }
         // then broadcast to children, but only if the item is not a styled one
-        if (!m_extension) {
-            UCThemingExtension::forwardEvent(m_item, &event);
+        if (!extension) {
+            notifyThemeChange(m_item, oldTheme, newTheme);
         }
     }
     m_prevParent = newParent;
 }
 
-void UCItemAttached::reloadTheme()
-{
-    Q_ASSERT(m_extension);
-    m_extension->preThemeChanged();
-    m_extension->postThemeChanged();
-    UCThemingExtension::broadcastThemeReloaded(m_item, static_cast<UCTheme*>(sender()));
-}
-
 /*************************************************************************
  *
  */
-UCThemingExtension::UCThemingExtension()
-    : themedItem(Q_NULLPTR)
-    , attachedThemer(Q_NULLPTR)
-    , theme(&UCTheme::defaultTheme())
+UCThemingExtension::UCThemingExtension(QQuickItem *extendedItem)
+    : theme(&UCTheme::defaultTheme())
+    , themedItem(extendedItem)
     , themeType(Inherited)
 {
+    theme->attachItem(themedItem, true);
+    themedItem->setUserData(xdata, new UCItemAttached(themedItem));
+}
+
+UCThemingExtension::~UCThemingExtension()
+{
+    if (theme) {
+        theme->attachItem(themedItem, false);
+    }
 }
 
 // set the parent of the theme if the themeType is Custom
@@ -172,47 +156,50 @@
         return;
     }
     QQuickItem *upperThemed = ascendantThemed(QQuickItemPrivate::get(themedItem)->parentItem);
-    UCItemAttached *attached = static_cast<UCItemAttached*>(qmlAttachedPropertiesObject<UCItemAttached>(upperThemed));
-    UCTheme *parentTheme = (attached && attached->m_extension) ? attached->m_extension->getTheme() : &UCTheme::defaultTheme();
+    UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(upperThemed);
+    UCTheme *parentTheme = extension ? extension->getTheme() : &UCTheme::defaultTheme();
     if (parentTheme != theme) {
         theme->setParentTheme(parentTheme);
     }
 }
 
-void UCThemingExtension::initTheming(QQuickItem *item)
+void UCThemingExtension::itemThemeChanged(UCTheme*, UCTheme *newTheme)
 {
-    themedItem = item;
-    attachedThemer = static_cast<UCItemAttached*>(qmlAttachedPropertiesObject<UCItemAttached>(themedItem));
-    Q_ASSERT(attachedThemer);
-    attachedThemer->m_extension = this;
-    theme->attachItem(item, true);
+    switch (themeType) {
+    case Inherited: {
+        setTheme(newTheme, Inherited);
+        return;
+    }
+    case Custom: {
+        // set the theme's parent
+        theme->setParentTheme(newTheme);
+        return;
+    }
+    default: break;
+    }
 }
 
-void UCThemingExtension::handleThemeEvent(UCThemeEvent *event)
+void UCThemingExtension::itemThemeReloaded(UCTheme *theme)
 {
-    if ((int)event->type() == themeUpdatedId) {
-        switch (themeType) {
-        case Inherited: {
-            setTheme(event->newTheme(), Inherited);
-            return;
-        }
-        case Custom: {
-            // set the theme's parent
-            theme->setParentTheme(event->newTheme());
-            return;
-        }
-        default: break;
-        }
-    } else if ((int)event->type() == themeReloadedId) {
-        // no need to handle Inherited case, those items are all attached to the theme changes
-        switch (themeType) {
-        case Custom: {
+    switch (themeType) {
+    case Inherited: {
+        preThemeChanged();
+        postThemeChanged();
+        return;
+    }
+    case Custom: {
+        if (theme == this->theme) {
+            preThemeChanged();
+            postThemeChanged();
+            // forward to children
+            notifyThemeReloaded(themedItem, theme);
+        } else {
             // emit theme's parentThemeChanged()
-            Q_EMIT theme->parentThemeChanged();
-            return;
-        }
-        default: break;
-        }
+            Q_EMIT this->theme->parentThemeChanged();
+        }
+        return;
+    }
+    default: break;
     }
 }
 
@@ -250,26 +237,26 @@
     postThemeChanged();
 
     // broadcast to the children
-    broadcastThemeChange(themedItem, oldTheme, theme);
+    notifyThemeChange(themedItem, oldTheme, theme);
 }
 
 void UCThemingExtension::resetTheme()
 {
     QQuickItem *upperThemed = ascendantThemed(QQuickItemPrivate::get(themedItem)->parentItem);
-    UCItemAttached *attached = static_cast<UCItemAttached*>(qmlAttachedPropertiesObject<UCItemAttached>(upperThemed));
-    UCTheme *theme = (attached && attached->m_extension) ? attached->m_extension->getTheme() : &UCTheme::defaultTheme();
+    UCThemingExtension *extension = qobject_cast<UCThemingExtension*>(upperThemed);
+    UCTheme *theme = extension ? extension->getTheme() : &UCTheme::defaultTheme();
     setTheme(theme, Inherited);
 }
 
 // returns the closest themed ascendant
 QQuickItem *UCThemingExtension::ascendantThemed(QQuickItem *item)
 {
-    while (item && !UCItemAttached::isThemed(item)) {
-        // make sure it also has the theming attached
-        qmlAttachedPropertiesObject<UCItemAttached>(item);
+    while (item && !isThemed(item)) {
+        // if the item has no xdata set, means we haven't been here yet
+        if (!item->userData(xdata)) {
+            item->setUserData(xdata, new UCItemAttached(item));
+        }
         item = item->parentItem();
     }
     return item;
 }
-
-#include "moc_ucthemingextension.cpp"

=== modified file 'src/Ubuntu/Components/plugin/ucthemingextension.h'
--- src/Ubuntu/Components/plugin/ucthemingextension.h	2015-09-21 14:24:05 +0000
+++ src/Ubuntu/Components/plugin/ucthemingextension.h	2015-10-20 11:06:17 +0000
@@ -24,54 +24,10 @@
 #include <QtCore/QPointer>
 #include <QtQml>
 
+#include <QtQuick/private/qquickitem_p.h>
+
 class QQuickItem;
-class UCStyledItemBase;
 class UCTheme;
-class UCThemingExtension;
-class UCItemAttached : public QObject
-{
-    Q_OBJECT
-public:
-    explicit UCItemAttached(QObject *owner = 0);
-    ~UCItemAttached();
-    static bool isThemed(QQuickItem *item);
-    static UCItemAttached *qmlAttachedProperties(QObject *owner);
-
-    QQuickItem *m_item;
-    QQuickItem *m_prevParent;
-    UCThemingExtension *m_extension;
-
-private:
-    Q_SLOT void handleParentChanged(QQuickItem *newParent);
-    Q_SLOT void reloadTheme();
-
-    friend class UCThemingExtension;
-};
-QML_DECLARE_TYPEINFO(UCItemAttached, QML_HAS_ATTACHED_PROPERTIES)
-
-class UCThemeEvent : public QEvent
-{
-public: // statics
-    static bool isThemeEvent(const QEvent *event);
-
-public:
-    explicit UCThemeEvent(UCTheme *reloadedTheme);
-    UCThemeEvent(UCTheme *oldTheme, UCTheme *newTheme);
-    UCThemeEvent(const UCThemeEvent &other);
-
-    UCTheme *oldTheme() const
-    {
-        return m_oldTheme;
-    }
-    UCTheme *newTheme() const
-    {
-        return m_newTheme;
-    }
-private:
-    UCTheme *m_oldTheme;
-    UCTheme *m_newTheme;
-};
-
 class UCThemingExtension
 {
 public:
@@ -80,31 +36,30 @@
         Custom
     };
 
-    explicit UCThemingExtension();
+    explicit UCThemingExtension(QQuickItem *extendedItem);
+    virtual ~UCThemingExtension();
 
     virtual void preThemeChanged() = 0;
     virtual void postThemeChanged() = 0;
-
-    virtual void initTheming(QQuickItem *item);
-    virtual void handleThemeEvent(UCThemeEvent *event);
+    virtual void itemThemeChanged(UCTheme *, UCTheme*);
+    virtual void itemThemeReloaded(UCTheme *);
 
     UCTheme *getTheme() const;
     void setTheme(UCTheme *newTheme, ThemeType type = Custom);
     void resetTheme();
 
+    static bool isThemed(QQuickItem *item);
     static QQuickItem *ascendantThemed(QQuickItem *item);
 
-    static void forwardEvent(QQuickItem *item, UCThemeEvent *event);
-    static void broadcastThemeChange(QQuickItem *item, UCTheme *oldTheme, UCTheme *newTheme);
-    static void broadcastThemeReloaded(QQuickItem *item, UCTheme *theme);
-
 protected:
+    QPointer<UCTheme> theme;
     QQuickItem *themedItem;
-    UCItemAttached *attachedThemer;
-    QPointer<UCTheme> theme;
     ThemeType themeType;
 
     void setParentTheme();
 };
 
+#define UCThemingExtension_iid "org.qt-project.Qt.UCThemingExtension"
+Q_DECLARE_INTERFACE(UCThemingExtension, UCThemingExtension_iid)
+
 #endif // UCITEMEXTENSION_H

=== added file 'tests/unit_x11/tst_subtheming/OtherVersion.qml'
--- tests/unit_x11/tst_subtheming/OtherVersion.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/OtherVersion.qml	2015-10-20 11:06:17 +0000
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    width: units.gu(40)
+    height: units.gu(40)
+    theme.name: "Ubuntu.Components.Themes.Ambiance"
+    styleName: "OptionSelectorStyle"
+    StyledItemV12 { objectName: "otherStyled" }
+}

=== removed file 'tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml'
--- tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml	2015-05-26 15:05:46 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-StyledItem {
-    id: item
-    theme.name: "themes.CustomTheme"
-    theme.version: Ubuntu.version(1, 0)
-    styleName: "TestStyle"
-}

=== modified file 'tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml'
--- tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml	2015-05-26 15:05:46 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml	2015-10-20 11:06:17 +0000
@@ -19,6 +19,5 @@
 StyledItem {
     id: item
     theme.name: "themes.CustomTheme"
-    theme.version: Ubuntu.toolkitVersion
     styleName: "TestStyle"
 }

=== removed file 'tests/unit_x11/tst_subtheming/StyledItemFallback.qml'
--- tests/unit_x11/tst_subtheming/StyledItemFallback.qml	2015-05-26 15:05:46 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemFallback.qml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-StyledItem {
-    id: item
-    theme.name: "TestModule.TestTheme"
-    theme.version: Ubuntu.version(1, 0)
-    styleName: "TestStyle"
-}

=== modified file 'tests/unit_x11/tst_subtheming/StyledItemV12.qml'
--- tests/unit_x11/tst_subtheming/StyledItemV12.qml	2015-05-26 15:05:46 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemV12.qml	2015-10-20 11:06:17 +0000
@@ -14,11 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.3
+import Ubuntu.Components 1.2
 
 StyledItem {
     id: item
-    theme.name: "themes.CustomTheme"
-    theme.version: Ubuntu.version(1, 2)
-    styleName: "TestStyle"
+    width: units.gu(20)
+    height: units.gu(20)
+    style: Theme.createStyleComponent("OptionSelectorStyle.qml", item)
 }

=== modified file 'tests/unit_x11/tst_subtheming/StyledItemV13.qml'
--- tests/unit_x11/tst_subtheming/StyledItemV13.qml	2015-05-26 15:05:46 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemV13.qml	2015-10-20 11:06:17 +0000
@@ -19,6 +19,5 @@
 StyledItem {
     id: item
     theme.name: "themes.CustomTheme"
-    theme.version: Ubuntu.toolkitVersion
     styleName: "TestStyle"
 }

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-10-06 07:16:37 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-10-20 11:06:17 +0000
@@ -55,6 +55,7 @@
         UCTheme *rootTheme = globalTheme();
         QVERIFY(rootTheme);
         rootTheme->setName(theme);
+
     }
 
     void setTheme(const QString &theme, QQuickItem *watchedItem)
@@ -88,12 +89,14 @@
         m_xdgDataPath = QLatin1String(getenv("XDG_DATA_DIRS"));
         m_themesPath = QLatin1String(getenv("UBUNTU_UI_TOOLKIT_THEMES_PATH"));
         qputenv("SUPPRESS_DEPRECATED_NOTE", "yes");
+        qputenv("QT_MESSAGE_PATTERN", "");
     }
 
     void cleanup()
     {
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", m_themesPath.toLatin1());
         qputenv("XDG_DATA_DIRS", m_xdgDataPath.toLocal8Bit());
+        UCTheme::previousVersion = 0;
     }
 
     void test_default_theme()
@@ -282,11 +285,11 @@
         UCStyledItemBase *mainItem = qobject_cast<UCStyledItemBase*>(view->rootObject());
 
         QSignalSpy parentChangeSpy(testSet, SIGNAL(parentThemeChanged()));
-        UCStyledItemBasePrivate::get(testItem)->setTheme(testSet);
+        testItem->setTheme(testSet);
         parentChangeSpy.wait(200);
         QCOMPARE(parentChangeSpy.count(), 1);
         // test if the parent is correct
-        QCOMPARE(testSet->parentTheme(), UCStyledItemBasePrivate::get(mainItem)->getTheme());
+        QCOMPARE(testSet->parentTheme(), mainItem->getTheme());
     }
 
     void test_parent_set_reset_triggers_parent_change()
@@ -299,11 +302,11 @@
 
         // reset mainItem's theme should trigger parentChanged on testSet
         QSignalSpy parentChangeSpy(testSet, SIGNAL(parentThemeChanged()));
-        UCStyledItemBasePrivate::get(mainItem)->resetTheme();
+        mainItem->resetTheme();
         parentChangeSpy.wait(200);
         QCOMPARE(parentChangeSpy.count(), 1);
-        QCOMPARE(UCStyledItemBasePrivate::get(mainItem)->getTheme(), &UCTheme::defaultTheme());
-        QCOMPARE(testSet->parentTheme(), UCStyledItemBasePrivate::get(mainItem)->getTheme());
+        QCOMPARE(mainItem->getTheme(), &UCTheme::defaultTheme());
+        QCOMPARE(testSet->parentTheme(), mainItem->getTheme());
     }
 
     void test_parent_set_namechange_triggers_parent_change()
@@ -315,11 +318,11 @@
         // change mainItem.theme.name should trigger parentChanged on testSet
         QSignalSpy parentChangeSpy(testSet, SIGNAL(parentThemeChanged()));
         QSignalSpy themeChangeSpy(mainItem, SIGNAL(themeChanged()));
-        UCStyledItemBasePrivate::get(mainItem)->getTheme()->setName("Ubuntu.Components.Themes.SuruDark");
+        mainItem->getTheme()->setName("Ubuntu.Components.Themes.SuruDark");
         UbuntuTestCase::waitForSignal(&themeChangeSpy);
         parentChangeSpy.wait(200);
         QCOMPARE(parentChangeSpy.count(), 1);
-        QCOMPARE(testSet->parentTheme(), UCStyledItemBasePrivate::get(mainItem)->getTheme());
+        QCOMPARE(testSet->parentTheme(), mainItem->getTheme());
     }
 
 
@@ -333,10 +336,10 @@
         // verify theme changes
         UCStyledItemBase *styled = qobject_cast<UCStyledItemBase*>(view->rootObject());
         QVERIFY(styled);
-        QCOMPARE(UCStyledItemBasePrivate::get(styled)->getTheme()->name(), QString("Ubuntu.Components.Themes.SuruDark"));
+        QCOMPARE(styled->getTheme()->name(), QString("Ubuntu.Components.Themes.SuruDark"));
         // a deeper item's style name
         styled = view->findItem<UCStyledItemBase*>("secondLevelStyled");
-        QCOMPARE(UCStyledItemBasePrivate::get(styled)->getTheme()->name(), QString("Ubuntu.Components.Themes.SuruDark"));
+        QCOMPARE(styled->getTheme()->name(), QString("Ubuntu.Components.Themes.SuruDark"));
     }
 
     // changing StyledItem.theme.name for different items within a tree where
@@ -355,7 +358,7 @@
         // change theme name (theme)
         UCStyledItemBase *styled = view->findItem<UCStyledItemBase*>(itemName);
         QSignalSpy themeChangeSpy(styled, SIGNAL(themeChanged()));
-        UCStyledItemBasePrivate::get(styled)->getTheme()->setName("Ubuntu.Components.Themes.SuruDark");
+        styled->getTheme()->setName("Ubuntu.Components.Themes.SuruDark");
         UbuntuTestCase::waitForSignal(&themeChangeSpy);
         UCTheme *theme = view->globalTheme();
         QCOMPARE(theme->name(), QString("Ubuntu.Components.Themes.SuruDark"));
@@ -401,11 +404,11 @@
                     view->findItem<UCStyledItemBase*>(applyOnItem);
         QVERIFY(styledItem);
         // the theme is declared, but should not be set yet!!!
-        QVERIFY2(UCStyledItemBasePrivate::get(styledItem)->getTheme() != theme, "ThemeSettings should not be set yet!");
+        QVERIFY2(styledItem->getTheme() != theme, "ThemeSettings should not be set yet!");
         theme->setName(themeName);
         // set the style on the item
         QSignalSpy themeChangeSpy(styledItem, SIGNAL(themeChanged()));
-        UCStyledItemBasePrivate::get(styledItem)->setTheme(theme);
+        styledItem->setTheme(theme);
         UbuntuTestCase::waitForSignal(&themeChangeSpy);
         // test on the items
         for (int i = 0; i < testItems.count(); i++) {
@@ -413,8 +416,8 @@
             QString themeName = expectedStyleNames[i];
             bool success = sameTheme[i];
             styledItem = view->findItem<UCStyledItemBase*>(itemName);
-            QCOMPARE(UCStyledItemBasePrivate::get(styledItem)->getTheme() == theme, success);
-            QCOMPARE(UCStyledItemBasePrivate::get(styledItem)->getTheme()->name(), themeName);
+            QCOMPARE(styledItem->getTheme() == theme, success);
+            QCOMPARE(styledItem->getTheme()->name(), themeName);
         }
     }
 
@@ -451,15 +454,15 @@
 
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase("TestStyleChange.qml"));
         UCStyledItemBase *testItem = view->findItem<UCStyledItemBase*>(testStyledItem);
-        QCOMPARE(UCStyledItemBasePrivate::get(testItem)->getTheme()->name(), testStyledItemThemes[0]);
+        QCOMPARE(testItem->getTheme()->name(), testStyledItemThemes[0]);
 
         UCTheme *theme = view->findItem<UCTheme*>("Theme");
         theme->setName("Ubuntu.Components.Themes.SuruDark");
         UCStyledItemBase *suruItem = view->findItem<UCStyledItemBase*>(suruStyledItem);
         QSignalSpy themeChangeSpy(suruItem, SIGNAL(themeChanged()));
-        UCStyledItemBasePrivate::get(suruItem)->setTheme(theme);
+        suruItem->setTheme(theme);
         UbuntuTestCase::waitForSignal(&themeChangeSpy);
-        QCOMPARE(UCStyledItemBasePrivate::get(testItem)->getTheme()->name(), testStyledItemThemes[1]);
+        QCOMPARE(testItem->getTheme()->name(), testStyledItemThemes[1]);
 
         // get items and reparent
         QQuickItem *sourceItem = view->findItem<QQuickItem*>(sourceItemName);
@@ -470,7 +473,7 @@
         QSignalSpy themeSpy(testItem, SIGNAL(themeChanged()));
         sourceItem->setParentItem(newParentItem);
         themeSpy.wait(200);
-        QCOMPARE(UCStyledItemBasePrivate::get(testItem)->getTheme()->name(), testStyledItemThemes[2]);
+        QCOMPARE(testItem->getTheme()->name(), testStyledItemThemes[2]);
         QCOMPARE(themeSpy.count(), 1);
     }
 
@@ -480,8 +483,8 @@
         UCStyledItemBase *main = qobject_cast<UCStyledItemBase*>(view->rootObject());
         QVERIFY(main);
         UCStyledItemBase *test = view->findItem<UCStyledItemBase*>("firstLevelStyled");
-        QCOMPARE(UCStyledItemBasePrivate::get(main)->getTheme()->name(),
-                 UCStyledItemBasePrivate::get(test)->getTheme()->name());
+        QCOMPARE(main->getTheme()->name(),
+                 test->getTheme()->name());
     }
 
     void test_no_change_in_other_suru_dark()
@@ -510,7 +513,7 @@
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase("ChangeDefaultPaletteInChildren.qml"));
         QQuickItem *loader = view->findItem<QQuickItem*>("loader");
         UCStyledItemBase *main = qobject_cast<UCStyledItemBase*>(view->rootObject());
-        UCTheme *mainSet = UCStyledItemBasePrivate::get(main)->getTheme();
+        UCTheme *mainSet = main->getTheme();
         QQuickItem *item = loader->property("item").value<QQuickItem*>();
         QVERIFY(item);
 
@@ -590,20 +593,20 @@
         UCStyledItemBase *movableItem = view->findItem<UCStyledItemBase*>("movable");
 
         // verify movableItem's theme
-        QCOMPARE(UCStyledItemBasePrivate::get(root)->getTheme(), UCStyledItemBasePrivate::get(movableItem)->getTheme());
+        QCOMPARE(root->getTheme(), movableItem->getTheme());
 
         // set the theme for root
         QSignalSpy themeChangeSpy(root, SIGNAL(themeChanged()));
-        UCStyledItemBasePrivate::get(root)->setTheme(suruTheme);
+        root->setTheme(suruTheme);
         UbuntuTestCase::waitForSignal(&themeChangeSpy);
-        QCOMPARE(UCStyledItemBasePrivate::get(root)->getTheme(), UCStyledItemBasePrivate::get(movableItem)->getTheme());
+        QCOMPARE(root->getTheme(), movableItem->getTheme());
 
         // set the parent item of the test item to 0
         QSignalSpy spy(movableItem, SIGNAL(themeChanged()));
         movableItem->setParentItem(Q_NULLPTR);
         spy.wait(500);
         QCOMPARE(spy.count(), 1);
-        QCOMPARE(UCStyledItemBasePrivate::get(movableItem)->getTheme(), &UCTheme::defaultTheme());
+        QCOMPARE(movableItem->getTheme(), &UCTheme::defaultTheme());
     }
 
     void test_reparented_styleditem_special_case()
@@ -617,19 +620,19 @@
         UCStyledItemBase *movableItem = view->findItem<UCStyledItemBase*>("movable");
 
         // check the themes
-        QCOMPARE(UCStyledItemBasePrivate::get(root)->getTheme()->name(), QString("Ubuntu.Components.Themes.Ambiance"));
-        QCOMPARE(UCStyledItemBasePrivate::get(customThemedItem)->getTheme()->name(), QString("CustomTheme"));
-        QCOMPARE(UCStyledItemBasePrivate::get(movableItem)->getTheme()->name(), QString("Ubuntu.Components.Themes.Ambiance"));
+        QCOMPARE(root->getTheme()->name(), QString("Ubuntu.Components.Themes.Ambiance"));
+        QCOMPARE(customThemedItem->getTheme()->name(), QString("CustomTheme"));
+        QCOMPARE(movableItem->getTheme()->name(), QString("Ubuntu.Components.Themes.Ambiance"));
 
         // move the movableItem under customThemedItem
         movableItem->setParentItem(customThemedItem);
-        QCOMPARE(UCStyledItemBasePrivate::get(movableItem)->getTheme()->name(), QString("CustomTheme"));
+        QCOMPARE(movableItem->getTheme()->name(), QString("CustomTheme"));
 
         // set a new theme for the root, and make sure our theme stays the same
         QSignalSpy themeChangeSpy(root, SIGNAL(themeChanged()));
-        UCStyledItemBasePrivate::get(root)->setTheme(suruTheme);
+        root->setTheme(suruTheme);
         UbuntuTestCase::waitForSignal(&themeChangeSpy);
-        QCOMPARE(UCStyledItemBasePrivate::get(movableItem)->getTheme()->name(), QString("CustomTheme"));
+        QCOMPARE(movableItem->getTheme()->name(), QString("CustomTheme"));
     }
 
     void test_theme_versions_data()
@@ -661,6 +664,16 @@
         ThemeTestCase::ignoreWarning(document, 19, 1, "QML StyledItem: Warning: Style TestStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance");
     }
 
+    void test_mixed_versions() {
+        QTest::ignoreMessage(QtWarningMsg, "\"Mixing of Ubuntu.Components module versions 1.3 and 1.2 detected!\"");
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("OtherVersion.qml"));
+        QTest::waitForEvents();
+        UCStyledItemBase *newStyled = static_cast<UCStyledItemBase*>(view->rootObject());
+        UCStyledItemBase *otherStyled = view->findItem<UCStyledItemBase*>("otherStyled");
+        QCOMPARE(UCStyledItemBasePrivate::get(newStyled)->styleInstance()->objectName(), QString("OptionSelector13"));
+        QCOMPARE(UCStyledItemBasePrivate::get(otherStyled)->styleInstance()->objectName(), QString("OptionSelector12"));
+    }
+
     void test_deprecated_theme()
     {
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
@@ -710,7 +723,7 @@
     {
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase("StyleKept.qml"));
         UCStyledItemBase *button = view->findItem<UCStyledItemBase*>("TestButton");
-        UCTheme *theme = UCStyledItemBasePrivate::get(button)->getTheme();
+        UCTheme *theme = button->getTheme();
         QVERIFY(theme);
 
         QVERIFY(button->findChild<QQuickItem*>("TestStyle"));

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro'
--- tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-06-02 12:37:41 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-10-20 11:06:17 +0000
@@ -28,8 +28,6 @@
     themes/CustomTheme/1.3/TestStyle.qml \
     StyledItemV12.qml \
     StyledItemV13.qml \
-    StyledItemFallback.qml \
-    StyledItemAppThemeFallback.qml \
     DeprecatedTheme.qml \
     StyledItemAppThemeVersioned.qml \
     StyleOverride.qml \
@@ -43,6 +41,7 @@
     MoreStyleHints.qml \
     GroupPropertyBindingHints.qml \
     OverrideStyleHints.qml \
-    HintedButton.qml
+    HintedButton.qml \
+    OtherVersion.qml