Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1305190-ubuntu-app-launch into lp:ubuntu-ui-toolkit

[Leo Arias]

Use UbuntuUIToolkitWithFakeAppRunningTestCase as the base class for all the toolkit autopilot tests.

NOT READY TO REVIEW, just checking a weird issue here.

[lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1305190-ubuntu-app-launch]

1524. By Leo Arias on 2015-06-01

Moved the pointing device to the base class.

1525. By Leo Arias on 2015-06-01

Moved the launch qml file to the gallery tests.

1526. By Leo Arias on 2015-06-01

Use always the toolkit test launcher.

1527. By Leo Arias on 2015-06-01

Simplified the gallery tests by launching the installed ones with upstart.

1528. By Leo Arias on 2015-06-01

Removed the unused methods.

1529. By Leo Arias on 2015-06-01

Merged with prerequisite.

1530. By Leo Arias on 2015-06-02

Fixed the test source path.

Unmerged revisions

1530. By Leo Arias on 2015-06-02

Fixed the test source path.

1529. By Leo Arias on 2015-06-01

Merged with prerequisite.

1528. By Leo Arias on 2015-06-01

Removed the unused methods.

1527. By Leo Arias on 2015-06-01

Simplified the gallery tests by launching the installed ones with upstart.

1526. By Leo Arias on 2015-06-01

Use always the toolkit test launcher.

1525. By Leo Arias on 2015-06-01

Moved the launch qml file to the gallery tests.

1524. By Leo Arias on 2015-06-01

Moved the pointing device to the base class.

1523. By Leo Arias on 2015-06-01

Use UbuntuUIToolkitWithFakeAppRunningTestCase as the base class for all the toolkit autopilot tests.

=== modified file 'components.api'
--- components.api	2015-05-22 11:18:01 +0000
+++ components.api	2015-06-01 10:41:20 +0000
@@ -876,6 +876,7 @@
     function bool requestFocus(Qt.FocusReason reason)
     function bool requestFocus()
     property Component style
+    property string styleName
     property ThemeSettings theme
 Ubuntu.Components.ListItems.Subtitled 1.0 0.1: Base
     property string subText
@@ -1198,7 +1199,6 @@
 Ubuntu.PerformanceMetrics.TextureFromImage 1.0 0.1: Item
     property QImage image
 Ubuntu.Components.ThemeSettings 1.3: QtObject
-    function QQmlComponent* createStyleComponent(string styleName, QtObject parent)
     property string name
     property QtObject palette
     readonly property ThemeSettings parentTheme

=== modified file 'documentation/ubuntu-theming.qdoc'
--- documentation/ubuntu-theming.qdoc	2015-05-04 10:58:14 +0000
+++ documentation/ubuntu-theming.qdoc	2015-06-01 10:41:20 +0000
@@ -78,7 +78,7 @@
  * \section2 Naming conventions
  * With few exception, each toolkit component is having StyledItem as its base
  * component. The component is aimed to be the base component for all styled
- * elements in the toolkit. Modules providing additional  components to UI Toolkit
+ * elements in the toolkit. Modules providing additional components to UI Toolkit
  * can also use this component as base, especially if they want to provide styling
  * capabilities.
  *
@@ -93,7 +93,7 @@
  * AbstractButton {
  *     id: button
  *     // [...]
- *     style: theme.createStyleComponent("ButtonStyle.qml", button)
+ *     styleName: "ButtonStyle"
  * }
  * \endqml
  * Developers can override the style in two ways, depending on how they want to style
@@ -127,7 +127,7 @@
  * A typical example of such a style API is the PullToRefresh component's style:
  * \snippet Styles/1.2/PullToRefreshStyle.qml 0
  * The default style implementation can be found under Ubuntu.Components.Themes.Ambiance
- * theme \l {http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml}
+ * theme \l {http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/modules/Ubuntu/Components/Themes/Ambiance/1.3/PullToRefreshStyle.qml}
  * {PullToRefreshStyle.qml}.
  *
  * Beside these, component styles may provide default values for colors, fonts, widths,
@@ -141,15 +141,17 @@
  *
  * \section3 Override with a different style from the theme
  * Returning back to the ways to override a component's style, overriding by using a different
- * style from the theme can simply be done by calling the theme's \l{Theme::createStyleComponent}
- * {createStyleComponent()} function with the alternative style document name as follows:
+ * style from the theme can simply be done by assigning the document name to the \l {StyledItem::styleName}
+ * {StyledItem.styleName} property as follows:
  * \qml
  * Button {
  *     id: button
- *     style: theme.createStyleComponent("SquaryButtonStyle.qml", button)
+ *     styleName: "SquaryButtonStyle"
  * }
  * \endqml
- * \note This assumes that the \c SquaryButtonStyle.qml document is present in the theme.
+ * \note The document extension doesn't have to be specified, the style creation will automatically
+ * append the .qml extension to it. This kind of style override assumes that the \c SquaryButtonStyle.qml
+ * document is present in the theme.
  * This type of component styling makes sure the style will always have theme specific implementation
  * or coloring, however it also requires the style document to be present in all the themes
  * used by the application.
@@ -178,6 +180,10 @@
  *     }
  * }
  * \endqml
+ * \note Specifying a component for the \l {StyledItem::style}{StyledItem.style} has precedence
+ * over the \l {StyledItem::styleName}{StyledItem::styleName}. When both set, the stlke specified
+ * \c style property will be used. When this property is set to undefined or null, the style specified
+ * in \c styleName will be used. Obviously, when both properties are invalid, no style will be used.
  */
 
 /*!

=== modified file 'modules/Ubuntu/Components/1.1/Button.qml'
--- modules/Ubuntu/Components/1.1/Button.qml	2015-04-24 12:00:23 +0000
+++ modules/Ubuntu/Components/1.1/Button.qml	2015-06-01 10:41:20 +0000
@@ -122,5 +122,5 @@
     property string iconPosition: "left"
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("ButtonStyle.qml", button)
+    style: Theme.createStyleComponent("ButtonStyle.qml", button)
 }

=== modified file 'modules/Ubuntu/Components/1.3/ActionBar.qml'
--- modules/Ubuntu/Components/1.3/ActionBar.qml	2015-05-14 20:33:48 +0000
+++ modules/Ubuntu/Components/1.3/ActionBar.qml	2015-06-01 10:41:20 +0000
@@ -50,7 +50,7 @@
 */
 StyledItem {
     id: bar
-    style: theme.createStyleComponent("ActionBarStyle.qml", bar)
+    styleName: "ActionBarStyle"
 
     /*!
       The actions to display in the bar.

=== modified file 'modules/Ubuntu/Components/1.3/ActivityIndicator.qml'
--- modules/Ubuntu/Components/1.3/ActivityIndicator.qml	2015-04-25 08:54:58 +0000
+++ modules/Ubuntu/Components/1.3/ActivityIndicator.qml	2015-06-01 10:41:20 +0000
@@ -55,5 +55,5 @@
     implicitWidth: units.gu(3)
     implicitHeight: units.gu(3)
 
-    style: theme.createStyleComponent("ActivityIndicatorStyle.qml", indicator)
+    styleName: "ActivityIndicatorStyle"
 }

=== modified file 'modules/Ubuntu/Components/1.3/AppHeader.qml'
--- modules/Ubuntu/Components/1.3/AppHeader.qml	2015-04-30 08:32:44 +0000
+++ modules/Ubuntu/Components/1.3/AppHeader.qml	2015-06-01 10:41:20 +0000
@@ -343,6 +343,5 @@
     }
 
     theme.version: Components.Ubuntu.toolkitVersion
-    style: header.useDeprecatedToolbar ? theme.createStyleComponent("HeaderStyle.qml", header) :
-                                         theme.createStyleComponent("PageHeadStyle.qml", header)
+    styleName: header.useDeprecatedToolbar ? "HeaderStyle" : "PageHeadStyle"
 }

=== modified file 'modules/Ubuntu/Components/1.3/Button.qml'
--- modules/Ubuntu/Components/1.3/Button.qml	2015-04-25 08:54:58 +0000
+++ modules/Ubuntu/Components/1.3/Button.qml	2015-06-01 10:41:20 +0000
@@ -122,5 +122,5 @@
     property string iconPosition: "left"
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("ButtonStyle.qml", button)
+    styleName: "ButtonStyle"
 }

=== modified file 'modules/Ubuntu/Components/1.3/CheckBox.qml'
--- modules/Ubuntu/Components/1.3/CheckBox.qml	2015-04-25 08:54:58 +0000
+++ modules/Ubuntu/Components/1.3/CheckBox.qml	2015-06-01 10:41:20 +0000
@@ -50,5 +50,5 @@
     onTriggered: checked = !checked
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("CheckBoxStyle.qml", checkBox)
+    styleName: "CheckBoxStyle"
 }

=== modified file 'modules/Ubuntu/Components/1.3/ComboButton.qml'
--- modules/Ubuntu/Components/1.3/ComboButton.qml	2015-04-29 08:55:31 +0000
+++ modules/Ubuntu/Components/1.3/ComboButton.qml	2015-06-01 10:41:20 +0000
@@ -247,7 +247,7 @@
     property color dropdownColor: __styleInstance ? __styleInstance.defaultDropdownColor : color
 
 
-    style: theme.createStyleComponent("ComboButtonStyle.qml", combo)
+    styleName: "ComboButtonStyle"
 
     Component.onCompleted: {
         // update mouse area to report clicks only on the main button area

=== modified file 'modules/Ubuntu/Components/1.3/MainViewBase.qml'
--- modules/Ubuntu/Components/1.3/MainViewBase.qml	2015-04-25 08:54:58 +0000
+++ modules/Ubuntu/Components/1.3/MainViewBase.qml	2015-06-01 10:41:20 +0000
@@ -36,7 +36,7 @@
         id: background
         anchors.fill: parent
         // theme is inherited from PageTreeNode, no need to update versioning
-        style: theme.createStyleComponent("MainViewStyle.qml", background)
+        styleName: "MainViewStyle"
 
         property color headerColor: backgroundColor
         property color backgroundColor: theme.palette.normal.background

=== modified file 'modules/Ubuntu/Components/1.3/OptionSelector.qml'
--- modules/Ubuntu/Components/1.3/OptionSelector.qml	2015-04-29 07:21:29 +0000
+++ modules/Ubuntu/Components/1.3/OptionSelector.qml	2015-06-01 10:41:20 +0000
@@ -226,7 +226,7 @@
             }
             state: optionSelector.expanded ? "expanded" : "collapsed"
             theme.version: Toolkit.Ubuntu.toolkitVersion
-            style: theme.createStyleComponent("OptionSelectorStyle.qml", listContainer)
+            styleName: "OptionSelectorStyle"
             states: [ State {
                     name: "expanded"
                     when: listContainer.currentlyExpanded

=== modified file 'modules/Ubuntu/Components/1.3/ProgressBar.qml'
--- modules/Ubuntu/Components/1.3/ProgressBar.qml	2015-05-04 10:58:14 +0000
+++ modules/Ubuntu/Components/1.3/ProgressBar.qml	2015-06-01 10:41:20 +0000
@@ -71,5 +71,5 @@
     property bool showProgressPercentage: true
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("ProgressBarStyle.qml", progressBar)
+    styleName: "ProgressBarStyle"
 }

=== modified file 'modules/Ubuntu/Components/1.3/PullToRefresh.qml'
--- modules/Ubuntu/Components/1.3/PullToRefresh.qml	2015-04-29 07:21:29 +0000
+++ modules/Ubuntu/Components/1.3/PullToRefresh.qml	2015-06-01 10:41:20 +0000
@@ -223,7 +223,7 @@
     signal refresh()
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("PullToRefreshStyle.qml", control)
+    styleName: "PullToRefreshStyle"
     implicitHeight: __styleInstance.implicitHeight
     anchors {
         left: target.left

=== modified file 'modules/Ubuntu/Components/1.3/Scrollbar.qml'
--- modules/Ubuntu/Components/1.3/Scrollbar.qml	2015-04-25 08:54:58 +0000
+++ modules/Ubuntu/Components/1.3/Scrollbar.qml	2015-06-01 10:41:20 +0000
@@ -147,5 +147,5 @@
     }
 
     theme.version: Toolkit.Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("ScrollbarStyle.qml", scrollbar)
+    styleName: "ScrollbarStyle"
 }

=== modified file 'modules/Ubuntu/Components/1.3/Slider.qml'
--- modules/Ubuntu/Components/1.3/Slider.qml	2015-05-12 20:15:43 +0000
+++ modules/Ubuntu/Components/1.3/Slider.qml	2015-06-01 10:41:20 +0000
@@ -207,5 +207,5 @@
     }
 
     theme.version: Toolkit.Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("SliderStyle.qml", slider)
+    styleName: "SliderStyle"
 }

=== modified file 'modules/Ubuntu/Components/1.3/Switch.qml'
--- modules/Ubuntu/Components/1.3/Switch.qml	2015-04-25 08:54:58 +0000
+++ modules/Ubuntu/Components/1.3/Switch.qml	2015-06-01 10:41:20 +0000
@@ -40,5 +40,5 @@
 */
 CheckBox {
     id: switchItem
-    style: theme.createStyleComponent("SwitchStyle.qml", switchItem)
+    styleName: "SwitchStyle"
 }

=== modified file 'modules/Ubuntu/Components/1.3/TabBar.qml'
--- modules/Ubuntu/Components/1.3/TabBar.qml	2015-04-25 08:54:58 +0000
+++ modules/Ubuntu/Components/1.3/TabBar.qml	2015-06-01 10:41:20 +0000
@@ -98,7 +98,7 @@
     implicitHeight: units.gu(7.5)
     activeFocusOnPress: true
     theme.version: Toolkit.Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("TabBarStyle.qml", tabBar)
+    styleName: "TabBarStyle"
 
     QtObject {
         id: internal

=== modified file 'modules/Ubuntu/Components/1.3/TextArea.qml'
--- modules/Ubuntu/Components/1.3/TextArea.qml	2015-05-21 09:58:30 +0000
+++ modules/Ubuntu/Components/1.3/TextArea.qml	2015-06-01 10:41:20 +0000
@@ -892,5 +892,5 @@
     }
 
     theme.version: Ubuntu.Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("TextAreaStyle.qml", control)
+    styleName: "TextAreaStyle"
 }

=== modified file 'modules/Ubuntu/Components/1.3/TextCursor.qml'
--- modules/Ubuntu/Components/1.3/TextCursor.qml	2015-05-15 10:35:06 +0000
+++ modules/Ubuntu/Components/1.3/TextCursor.qml	2015-06-01 10:41:20 +0000
@@ -42,7 +42,7 @@
                                            __styleInstance.cursorDelegate
 
     theme.version: Ubuntu.Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("TextCursorStyle.qml", cursorItem);
+    styleName: "TextCursorStyle"
 
     objectName: "textCursor"
     //Caret instance from the style.

=== modified file 'modules/Ubuntu/Components/1.3/TextField.qml'
--- modules/Ubuntu/Components/1.3/TextField.qml	2015-05-21 09:58:30 +0000
+++ modules/Ubuntu/Components/1.3/TextField.qml	2015-06-01 10:41:20 +0000
@@ -1020,5 +1020,5 @@
     }
 
     theme.version: Ubuntu.Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("TextFieldStyle.qml", control)
+    styleName: "TextFieldStyle"
 }

=== modified file 'modules/Ubuntu/Components/1.3/TextInputPopover.qml'
--- modules/Ubuntu/Components/1.3/TextInputPopover.qml	2015-05-20 06:31:45 +0000
+++ modules/Ubuntu/Components/1.3/TextInputPopover.qml	2015-06-01 10:41:20 +0000
@@ -98,7 +98,7 @@
                 height: units.gu(6)
                 action: actions[modelData]
                 theme.version: Ubuntu.toolkitVersion
-                style: theme.createStyleComponent("ToolbarButtonStyle.qml", button)
+                styleName: "ToolbarButtonStyle"
             }
         }
     }

=== modified file 'modules/Ubuntu/Components/1.3/Toolbar.qml'
--- modules/Ubuntu/Components/1.3/Toolbar.qml	2015-04-25 08:54:58 +0000
+++ modules/Ubuntu/Components/1.3/Toolbar.qml	2015-06-01 10:41:20 +0000
@@ -136,7 +136,7 @@
         property bool animating: toolbar.animating
 
         theme.version: Toolkit.Ubuntu.toolkitVersion
-        style: theme.createStyleComponent("ToolbarStyle.qml", background)
+        styleName: "ToolbarStyle"
     }
 
     Item {

=== modified file 'modules/Ubuntu/Components/1.3/ToolbarButton.qml'
--- modules/Ubuntu/Components/1.3/ToolbarButton.qml	2015-04-25 08:54:58 +0000
+++ modules/Ubuntu/Components/1.3/ToolbarButton.qml	2015-06-01 10:41:20 +0000
@@ -85,5 +85,5 @@
     width: units.gu(5)
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("ToolbarButtonStyle.qml", toolbarButton)
+    styleName: "ToolbarButtonStyle"
 }

=== modified file 'modules/Ubuntu/Components/ListItems/1.2/Caption.qml'
--- modules/Ubuntu/Components/ListItems/1.2/Caption.qml	2015-04-30 08:32:44 +0000
+++ modules/Ubuntu/Components/ListItems/1.2/Caption.qml	2015-06-01 10:41:20 +0000
@@ -38,7 +38,7 @@
     \endqml
 */
 Item {
-    height: captionText.height + units.gu(1)
+    height: captionText.contentHeight + units.gu(2) * 2
     width: parent ? parent.width : units.gu(31)
 
     /*!
@@ -49,8 +49,14 @@
 
     Label {
         id: captionText
-        anchors.centerIn: parent
-        width: parent.width - units.gu(1)
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: parent.left
+            right: parent.right
+            //Margins are currently hardcoded to avoid adding new API
+            leftMargin: units.gu(2)
+            rightMargin: units.gu(2)
+        }
         wrapMode: Text.Wrap
         color: Theme.palette.normal.backgroundText
         horizontalAlignment: Text.AlignLeft

=== modified file 'modules/Ubuntu/Components/ListItems/1.3/Caption.qml'
--- modules/Ubuntu/Components/ListItems/1.3/Caption.qml	2015-04-29 07:21:29 +0000
+++ modules/Ubuntu/Components/ListItems/1.3/Caption.qml	2015-06-01 10:41:20 +0000
@@ -38,7 +38,7 @@
     \endqml
 */
 Item {
-    height: captionText.height + units.gu(1)
+    height: captionText.contentHeight + units.gu(2) * 2
     width: parent ? parent.width : units.gu(31)
 
     /*!
@@ -49,8 +49,14 @@
 
     Label {
         id: captionText
-        anchors.centerIn: parent
-        width: parent.width - units.gu(1)
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: parent.left
+            right: parent.right
+            //Margins are currently hardcoded to avoid adding new API
+            leftMargin: units.gu(2)
+            rightMargin: units.gu(2)
+        }
         wrapMode: Text.Wrap
         color: theme.palette.normal.backgroundText
         horizontalAlignment: Text.AlignLeft

=== modified file 'modules/Ubuntu/Components/ListItems/1.3/ItemSelector.qml'
--- modules/Ubuntu/Components/ListItems/1.3/ItemSelector.qml	2015-04-29 07:21:29 +0000
+++ modules/Ubuntu/Components/ListItems/1.3/ItemSelector.qml	2015-06-01 10:41:20 +0000
@@ -217,7 +217,7 @@
             }
             state: itemSelector.expanded ? "expanded" : "collapsed"
             theme.version: Ubuntu.toolkitVersion
-            style: theme.createStyleComponent("ListItemOptionSelectorStyle.qml", listContainer)
+            styleName: "ListItemOptionSelectorStyle"
 
             states: [ State {
                     name: "expanded"

=== modified file 'modules/Ubuntu/Components/ListItems/1.3/ProgressionVisual.qml'
--- modules/Ubuntu/Components/ListItems/1.3/ProgressionVisual.qml	2015-04-29 07:21:29 +0000
+++ modules/Ubuntu/Components/ListItems/1.3/ProgressionVisual.qml	2015-06-01 10:41:20 +0000
@@ -26,5 +26,5 @@
     property real splitMargin
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("ProgressionVisualStyle.qml", progressionVisual)
+    styleName: "ProgressionVisualStyle"
 }

=== modified file 'modules/Ubuntu/Components/Pickers/1.3/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/1.3/DatePicker.qml	2015-04-29 07:44:05 +0000
+++ modules/Ubuntu/Components/Pickers/1.3/DatePicker.qml	2015-06-01 10:41:20 +0000
@@ -421,7 +421,7 @@
     }
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("DatePickerStyle.qml", datePicker)
+    styleName: "DatePickerStyle"
     Binding {
         target: __styleInstance
         property: "view"

=== modified file 'modules/Ubuntu/Components/Pickers/1.3/Dialer.qml'
--- modules/Ubuntu/Components/Pickers/1.3/Dialer.qml	2015-04-29 07:44:05 +0000
+++ modules/Ubuntu/Components/Pickers/1.3/Dialer.qml	2015-06-01 10:41:20 +0000
@@ -146,7 +146,7 @@
     activeFocusOnPress: true
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("DialerStyle.qml", dialer)
+    styleName: "DialerStyle"
 
     Item {
         id: internal

=== modified file 'modules/Ubuntu/Components/Pickers/1.3/DialerHand.qml'
--- modules/Ubuntu/Components/Pickers/1.3/DialerHand.qml	2015-04-29 07:44:05 +0000
+++ modules/Ubuntu/Components/Pickers/1.3/DialerHand.qml	2015-06-01 10:41:20 +0000
@@ -144,7 +144,7 @@
     height: parent.height
     activeFocusOnPress: true
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("DialerHandStyle.qml", dialerHand)
+    styleName: "DialerHandStyle"
 
     /*! \internal */
     onParentChanged: {

=== modified file 'modules/Ubuntu/Components/Pickers/1.3/Picker.qml'
--- modules/Ubuntu/Components/Pickers/1.3/Picker.qml	2015-04-29 07:44:05 +0000
+++ modules/Ubuntu/Components/Pickers/1.3/Picker.qml	2015-06-01 10:41:20 +0000
@@ -160,7 +160,7 @@
     activeFocusOnPress: true
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("PickerStyle.qml", picker)
+    styleName: "PickerStyle"
 
     /*! \internal */
     property int __clickedIndex: -1

=== modified file 'modules/Ubuntu/Components/Pickers/1.3/PickerDelegate.qml'
--- modules/Ubuntu/Components/Pickers/1.3/PickerDelegate.qml	2015-04-29 07:44:05 +0000
+++ modules/Ubuntu/Components/Pickers/1.3/PickerDelegate.qml	2015-06-01 10:41:20 +0000
@@ -48,7 +48,7 @@
     }
 
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("PickerDelegateStyle.qml", pickerDelegate)
+    styleName: "PickerDelegateStyle"
 
     QtObject {
         id: internal

=== modified file 'modules/Ubuntu/Components/Popups/1.3/Dialog.qml'
--- modules/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-04-29 08:55:31 +0000
+++ modules/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-06-01 10:41:20 +0000
@@ -214,6 +214,6 @@
         }
 
         theme.version: Ubuntu.toolkitVersion
-        style: theme.createStyleComponent("DialogForegroundStyle.qml", foreground)
+        styleName: "DialogForegroundStyle"
     }
 }

=== modified file 'modules/Ubuntu/Components/Popups/1.3/Popover.qml'
--- modules/Ubuntu/Components/Popups/1.3/Popover.qml	2015-04-29 08:55:31 +0000
+++ modules/Ubuntu/Components/Popups/1.3/Popover.qml	2015-06-01 10:41:20 +0000
@@ -238,7 +238,7 @@
         signal hideCompleted()
 
         theme.version: Ubuntu.toolkitVersion
-        style: theme.createStyleComponent("PopoverForegroundStyle.qml", foreground)
+        styleName: "PopoverForegroundStyle"
     }
 
     QtObject {

=== modified file 'modules/Ubuntu/Components/Popups/1.3/SheetBase.qml'
--- modules/Ubuntu/Components/Popups/1.3/SheetBase.qml	2015-04-29 08:55:31 +0000
+++ modules/Ubuntu/Components/Popups/1.3/SheetBase.qml	2015-06-01 10:41:20 +0000
@@ -110,6 +110,6 @@
         }
 
         theme.version: Ubuntu.toolkitVersion
-        style: theme.createStyleComponent("SheetForegroundStyle.qml", sheet)
+        styleName: "SheetForegroundStyle"
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2015-05-14 21:36:26 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2015-06-01 10:41:20 +0000
@@ -58,19 +58,21 @@
         Repeater {
             objectName: "actions_repeater"
             model: numberOfSlots.used
-            PageHeadButton {
+            AbstractButton {
+                style: IconButtonStyle { }
                 id: actionButton
                 objectName: action.objectName + "_action_button"
+                height: actionsContainer.height
                 action: actionsContainer.visibleActions[index]
-                iconWidth: units.gu(2)
             }
         }
 
-        PageHeadButton {
+        AbstractButton {
+            style: IconButtonStyle { }
             id: actionsOverflowButton
             objectName: "actions_overflow_button"
+            height: actionsContainer.height
             visible: numberOfSlots.requested > numberOfSlots.available
-            iconWidth: units.gu(2)
 
             // Ensure resetting of X when this button is not visible to avoid
             // miscalculation of actionsContainer.width. Fixes bug #1408481.

=== added file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/IconButtonStyle.qml	2015-06-01 10:41:20 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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
+
+Item {
+    id: iconButtonStyle
+
+    implicitWidth: units.gu(5)
+    implicitHeight: units.gu(5)
+
+    /*!
+      The color of the icons.
+     */
+    property color foregroundColor: "#808080"
+
+    /*!
+      The background color of the button.
+     */
+    property color backgroundColor: styledItem.pressed ?
+                                        theme.palette.selected.background :
+                                        "transparent"
+
+    property real iconWidth: units.gu(2)
+    property real iconHeight: iconWidth
+
+    /*!
+      Show a text label under the icon.
+     */
+    property bool showLabel: false
+
+    Rectangle {
+        id: background
+        color: iconButtonStyle.backgroundColor
+        anchors.fill: parent
+    }
+
+    Icon {
+        id: icon
+        anchors.centerIn: parent
+        width: iconButtonStyle.iconWidth
+        height: iconButtonStyle.iconHeight
+        source: styledItem.iconSource
+        color: iconButtonStyle.foregroundColor
+        opacity: styledItem.enabled ? 1.0 : 0.3
+    }
+
+    Component {
+        id: labelComponent
+        Label {
+            objectName: styledItem.objectName + "_label"
+            color: iconButtonStyle.foregroundColor
+            opacity: styledItem.enabled ? 1.0 : 0.3
+            text: styledItem.text
+            fontSize: "xx-small"
+        }
+    }
+    Loader {
+        anchors {
+            top: icon.bottom
+            topMargin: units.gu(0.5)
+            horizontalCenter: parent.horizontalCenter
+        }
+        sourceComponent: iconButtonStyle.showLabel ? labelComponent : null
+    }
+}

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml	2015-05-12 15:05:28 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml	2015-06-01 10:41:20 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
+// TODO: Remove this component when PageHeadStyle uses ActionBar
 AbstractButton {
     id: button
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2015-05-11 14:43:39 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2015-06-01 10:41:20 +0000
@@ -106,7 +106,7 @@
         // backgroundColor is used in the new HeadDividerStyle
         property color backgroundColor: styledItem.dividerColor
 
-        style: theme.createStyleComponent("HeadDividerStyle.qml", divider)
+        styleName: "HeadDividerStyle"
 
         property PageHeadSections sections: styledItem.config.sections
 

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2015-04-27 07:06:30 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-06-01 10:41:20 +0000
@@ -210,6 +210,7 @@
     qmlRegisterType<UCTheme>(uri, 1, 3, "ThemeSettings");
     qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItem");
     qmlRegisterSingletonType<UCNamespaceV13>(uri, 1, 3, "Ubuntu", registerUbuntuNamespace13);
+    qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItem");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
--- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-05-18 05:42:05 +0000
+++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-06-01 10:41:20 +0000
@@ -23,6 +23,7 @@
 #include <QtQml/QQmlComponent>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlInfo>
+#include <QtQml/QQmlEngine>
 
 /*!
     \qmltype Theme
@@ -74,6 +75,14 @@
 
 void UCDeprecatedTheme::showDeprecatedNote(QObject *onItem, const char *note)
 {
+    QQmlContext ctx(QQmlEngine::contextForObject(onItem));
+    // No warnings due to deprecated code used in the components themselves
+    if (ctx.baseUrl().toString().contains("/Ubuntu/Components/"))
+        return;
+    // Warnings without a filename are not helpful
+    if (ctx.baseUrl().isEmpty())
+        return;
+
     QString noteId(QString("%1.%2").arg(note).arg(onItem->metaObject()->className()));
     if (m_notes.contains(noteId))
         return;

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-04-14 08:31:20 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-06-01 10:41:20 +0000
@@ -185,7 +185,6 @@
     , suppressClick(false)
     , ready(false)
     , customColor(false)
-    , customStyle(false)
     , xAxisMoveThresholdGU(DEFAULT_SWIPE_THRESHOLD_GU)
     , color(Qt::transparent)
     , highlightColor(Qt::transparent)
@@ -196,7 +195,6 @@
     , trailingActions(0)
     , mainAction(0)
 {
-    styleLoadingMethod = DelayTillExplicitRequested;
 }
 UCListItemPrivate::~UCListItemPrivate()
 {
@@ -229,6 +227,7 @@
     // watch grid unit size change and set implicit size
     QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()), q, SLOT(_q_updateSize()));
     _q_updateSize();
+    setStyleName("ListItemStyle");
 }
 
 void UCListItemPrivate::_q_themeChanged()
@@ -260,12 +259,6 @@
     Q_Q(UCListItem);
     // update divider colors
     divider->paletteChanged();
-    // if not using custom style, reload style component from theme
-    if (!customStyle && componentComplete) {
-        // use style setter but reset custom style flag
-        setStyle(getTheme()->createStyleComponent("ListItemStyle.qml", q));
-        customStyle = false;
-    }
 
     // update colors, panels
     if (!customColor) {
@@ -315,44 +308,35 @@
     Q_EMIT q->dragModeChanged();
 }
 
-/*!
- * \qmlproperty Component ListItem::style
- * Holds the style of the component defining the components visualizing the leading/
- * trailing actions, selection and dragging mode handlers as well as different
- * animations. The component does not assume any visuals present in the style,
- * and will load its content only when requested.
- * \sa ListItemStyle
- */
 void UCListItemPrivate::preStyleChanged()
 {
     snapOut();
     UCStyledItemBasePrivate::preStyleChanged();
-    // delete style if it was non-custom style
-    if (!customStyle && styleComponent) {
-        styleComponent->deleteLater();
-        styleComponent = 0;
-    }
-    customStyle = true;
 }
 
 // creates the style item, with altered default value of the animatePanels style property
 // the property is turned on after the panel initialization.
-void UCListItemPrivate::loadStyleItem(bool animated)
+bool UCListItemPrivate::loadStyleItem(bool animated)
 {
-    if (!styleComponent) {
-        // try to create the style if possible
-        postThemeChanged();
-    }
-    UCStyledItemBasePrivate::loadStyleItem(animated);
+    // the style should be loaded only if one of the condition is satisfied
+    if (!swiped && !selectMode() && !dragMode()) {
+        return false;
+    }
+
+    if (!UCStyledItemBasePrivate::loadStyleItem(animated)) {
+        return false;
+    }
+
     UCListItemStyle *myStyle = qobject_cast<UCListItemStyle*>(styleItem);
     if (!myStyle) {
         // the style is not derived from ListItemStyle, clean
         preStyleChanged();
-        return;
+        return false;
     }
     // bring the panels foreground
     styleItem->setZ(0);
     listItemStyle()->setAnimatePanels(true);
+    return true;
 }
 
 // called when units size changes
@@ -885,6 +869,13 @@
  * \endqml
  *
  * \sa ViewItems::dragMode, ViewItems::dragUpdated
+ *
+ * \section2 Note on styling
+ * ListItem's styling differs from the other component sstyling, as ListItem loads
+ * the style only when either of the leadin/trailing panels are swiped, or when the
+ * item enters in select- or drag mode. The component does not assume any visuals
+ * to be present in the style.
+ * \sa ListItemStyle
  */
 
 /*!
@@ -1134,6 +1125,7 @@
                 d->parentAttached->disableInteractive(this, true);
             }
             d->setSwiped(true);
+            d->loadStyleItem();
         }
     }
 

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-04-14 08:31:20 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-06-01 10:41:20 +0000
@@ -74,7 +74,6 @@
     bool suppressClick:1;
     bool ready:1;
     bool customColor:1;
-    bool customStyle:1;
     qreal xAxisMoveThresholdGU;
     QBasicTimer pressAndHoldTimer;
     QPointF lastPos;
@@ -98,7 +97,7 @@
     bool contentMoving() const;
     void setContentMoving(bool moved);
     virtual void preStyleChanged();
-    virtual void loadStyleItem(bool animated = true);
+    virtual bool loadStyleItem(bool animated = true);
     bool dragging();
     bool dragMode();
     void setDragMode(bool draggable);

=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-04-21 13:21:17 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-06-01 10:41:20 +0000
@@ -24,7 +24,6 @@
 
 UCStyledItemBasePrivate::UCStyledItemBasePrivate()
     : activeFocusOnPress(false)
-    , styleLoadingMethod(Immediate)
     , styleComponent(0)
     , styleItemContext(0)
     , styleItem(0)
@@ -41,8 +40,10 @@
 {
     Q_Q(UCStyledItemBase);
     q->setFlag(QQuickItem::ItemIsFocusScope);
-    QObject::connect(&UCTheme::defaultTheme(), &UCTheme::nameChanged,
-                     q, &UCStyledItemBase::themeChanged);
+    QObject::connect(&UCTheme::defaultTheme(), SIGNAL(nameChanged()),
+                     q, SLOT(_q_reloadStyle()));
+    QObject::connect(&UCTheme::defaultTheme(), SIGNAL(versionChanged()),
+                     q, SLOT(_q_reloadStyle()));
 }
 
 
@@ -90,12 +91,17 @@
  * \qml
  * StyledItem {
  *     id: myItem
- *     style: theme.createStyleComponent("MyItemStyle.qml", myItem)
+ *     styleName: "MyItemStyle"
  * }
  * \endqml
  *
- * The Component set on \l style is instantiated and placed below everything else
- * that the Item contains.
+ * The style set on \l styleName is instantiated and placed below everything else
+ * that the Item contains. When the style is defined in this way, the style is taken
+ * from the current theme the StyledItem is themed with. Another way tpo set the
+ * style of a component is to set the \l style property. This property expects a
+ * component and it has precedence over the \l styleName, meaning that when both
+ * \l styleName and \l style are set, the style will be created from the \l style
+ * componment.
  *
  * A reference to the Item being styled is accessible from the style and named
  * 'styledItem'.
@@ -201,7 +207,26 @@
 
 /*!
  * \qmlproperty Component StyledItem::style
- * Component instantiated immediately and placed below everything else.
+ * Style component instantiated immediately and placed below everything else.
+ * Has precedence over the \l styleName. When both set, the style will be
+ * created from the component given as property value, and can be reset to the
+ * theme style when set to null or reset (set to undefined).
+ * \qml
+ * Button {
+ *     text: "Press to reset"
+ *     style: Rectangle {
+ *         color: "tan"
+ *         Label {
+ *             anchors {
+ *                 fill: parent
+ *                 margins: units.gu(1)
+ *             }
+ *             text: styledItem.text
+ *         }
+ *     }
+ *     onClicked: style = undefined
+ * }
+ * \endqml
  */
 QQmlComponent *UCStyledItemBasePrivate::style() const
 {
@@ -218,6 +243,42 @@
     postStyleChanged();
     loadStyleItem();
 }
+void UCStyledItemBasePrivate::resetStyle()
+{
+    setStyle(Q_NULLPTR);
+}
+
+/*!
+ * \qmlproperty string StyledItem::styleName
+ * The property specifies the component style name. The style name is a document
+ * in the current theme, and should not contain the qml file extension. If specified
+ * an error will be shown.
+ * \qml
+ * StyledItem {
+ *     id: myItem
+ *     styleName: "MyItemStyle"
+ * }
+ * \endqml
+ * \note \l style property has precedence over styleName.
+ */
+QString UCStyledItemBasePrivate::styleName() const
+{
+    return styleDocument;
+}
+void UCStyledItemBasePrivate::setStyleName(const QString &name)
+{
+    if (name == styleDocument) {
+        return;
+    }
+    QString prevName = styleDocument;
+    styleDocument = name;
+    if (prevName != styleDocument && !styleComponent) {
+        preStyleChanged();
+        postStyleChanged();
+    }
+    Q_EMIT q_func()->styleNameChanged();
+    loadStyleItem();
+}
 
 // performs pre-style change actions, removes style item size change
 // connections and destroys the style component
@@ -236,36 +297,37 @@
     }
 }
 
-// performs post-style change actions, creates the context object the
-// style item will be created in
-void UCStyledItemBasePrivate::postStyleChanged()
+// loads the style animated or not, depending on the loading time
+// returns true on successful style loading
+bool UCStyledItemBasePrivate::loadStyleItem(bool animated)
 {
-    if (!styleComponent || styleItemContext) {
-        return;
+    if (styleItem || (!styleComponent && styleDocument.isEmpty()) || !componentComplete) {
+        // the style loading is delayed
+        return false;
     }
     Q_Q(UCStyledItemBase);
+    // either styleComponent or styleName is valid
+    QQmlComponent *component = styleComponent;
+    if (!component) {
+        component = getTheme()->createStyleComponent(styleDocument + ".qml", q);
+    }
+    if (!component) {
+        return false;
+    }
+    // create context
     // use creation context as parent to create the context we load the style item with
-    QQmlContext *creationContext = styleComponent->creationContext();
+    QQmlContext *creationContext = component->creationContext();
     if (!creationContext) {
         creationContext = qmlContext(q);
     }
     styleItemContext = new QQmlContext(creationContext);
     styleItemContext->setContextObject(q);
     styleItemContext->setContextProperty("styledItem", q);
-}
-
-// loads the style animated or not, depending on the loading time
-void UCStyledItemBasePrivate::loadStyleItem(bool animated)
-{
-    if (styleItem || !styleComponent || !styleItemContext || (styleLoadingMethod != Immediate && !componentComplete)) {
-        // the style loading is delayed
-        return;
-    }
-    Q_Q(UCStyledItemBase);
     styleItemContext->setContextProperty("animated", animated);
-    QObject *object = styleComponent->beginCreate(styleItemContext);
+    QObject *object = component->beginCreate(styleItemContext);
     if (!object) {
-        return;
+        delete styleItemContext;
+        return false;
     }
     // link context to the style item to delete them together
     QQml_setParent_noEvent(styleItemContext, object);
@@ -281,7 +343,11 @@
     } else {
         delete object;
     }
-    styleComponent->completeCreate();
+    component->completeCreate();
+    // delete temporary component
+    if (!styleComponent) {
+        delete component;
+    }
 
     // make sure we reset the animated property to true
     if (!animated) {
@@ -292,6 +358,7 @@
     _q_styleResized();
     connectStyleSizeChanges(true);
     Q_EMIT q->styleInstanceChanged();
+    return true;
 }
 
 /*!
@@ -339,6 +406,19 @@
     }
 }
 
+// reloads style component due to theme, theme.name or theme.version change
+void UCStyledItemBasePrivate::_q_reloadStyle()
+{
+    if (styleComponent) {
+        return;
+    }
+    Q_Q(UCStyledItemBase);
+    preStyleChanged();
+    postStyleChanged();
+    loadStyleItem();
+    Q_EMIT q->themeChanged();
+}
+
 // handle implicit size changes implied by the style components
 void UCStyledItemBasePrivate::_q_styleResized()
 {
@@ -395,8 +475,10 @@
                                 theme :
                                 (!parentStyledItem ? &UCTheme::defaultTheme() : NULL);
     if (connectedSet) {
-        QObject::disconnect(connectedSet, &UCTheme::nameChanged,
-                            q, &UCStyledItemBase::themeChanged);
+        QObject::disconnect(connectedSet, SIGNAL(nameChanged()),
+                            q, SLOT(_q_reloadStyle()));
+        QObject::disconnect(connectedSet, SIGNAL(versionChanged()),
+                            q, SLOT(_q_reloadStyle()));
     }
 
     UCTheme *prevSet = theme;
@@ -419,8 +501,10 @@
                     theme :
                     (!parentStyledItem ? &UCTheme::defaultTheme() : NULL);
     if (connectedSet) {
-        QObject::connect(connectedSet, &UCTheme::nameChanged,
-                         q, &UCStyledItemBase::themeChanged);
+        QObject::connect(connectedSet, SIGNAL(nameChanged()),
+                         q, SLOT(_q_reloadStyle()));
+        QObject::connect(connectedSet, SIGNAL(versionChanged()),
+                         q, SLOT(_q_reloadStyle()));
     }
     // detach previous set and attach the new one
     if (prevSet) {
@@ -437,6 +521,13 @@
     postThemeChanged();
 
     Q_EMIT q->themeChanged();
+
+    // perform style reload
+    if (!styleComponent) {
+        preStyleChanged();
+        postStyleChanged();
+        loadStyleItem();
+    }
 }
 void UCStyledItemBasePrivate::resetTheme()
 {
@@ -542,10 +633,10 @@
 {
     QQuickItem::componentComplete();
     Q_D(UCStyledItemBase);
-    if (d->styleLoadingMethod == UCStyledItemBasePrivate::DelayTillCompleted) {
-        // the delayed completion disables animations
-        d->loadStyleItem(false);
-    }
+    // no animation at this time
+    // prepare style context if not been done yet
+    d->postStyleChanged();
+    d->loadStyleItem(false);
 }
 
 // grab pressed state and focus if it can be

=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase.h'
--- modules/Ubuntu/Components/plugin/ucstyleditembase.h	2015-04-13 13:42:03 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase.h	2015-06-01 10:41:20 +0000
@@ -29,8 +29,9 @@
     Q_PROPERTY(bool activeFocusOnPress
                READ activefocusOnPress WRITE setActiveFocusOnPress
                NOTIFY activeFocusOnPressChanged REVISION 1)
-    Q_PRIVATE_PROPERTY(UCStyledItemBase::d_func(), QQmlComponent *style READ style WRITE setStyle NOTIFY styleChanged FINAL DESIGNABLE false)
+    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)
 public:
     explicit UCStyledItemBase(QQuickItem *parent = 0);
@@ -46,6 +47,7 @@
     void styleInstanceChanged();
     Q_REVISION(1) void activeFocusOnPressChanged();
     Q_REVISION(2) void themeChanged();
+    Q_REVISION(2) void styleNameChanged();
 
 protected:
     UCStyledItemBase(UCStyledItemBasePrivate &, QQuickItem *parent);
@@ -60,6 +62,7 @@
     Q_PRIVATE_SLOT(d_func(), void _q_styleResized())
     Q_PRIVATE_SLOT(d_func(), void _q_ascendantChanged(QQuickItem*))
     Q_PRIVATE_SLOT(d_func(), void _q_parentStyleChanged())
+    Q_PRIVATE_SLOT(d_func(), void _q_reloadStyle())
 };
 
 #endif // UCSTYLEDITEMBASE_H

=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase_p.h'
--- modules/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-04-14 07:46:04 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-06-01 10:41:20 +0000
@@ -29,16 +29,11 @@
     Q_DECLARE_PUBLIC(UCStyledItemBase)
 public:
 
-    enum StyleLoadingMethod {
-        Immediate,
-        DelayTillCompleted,
-        DelayTillExplicitRequested
-    };
-
     static UCStyledItemBasePrivate *get(UCStyledItemBase *item) {
         return item->d_func();
     }
 
+    void _q_reloadStyle();
     void _q_styleResized();
     void _q_ascendantChanged(QQuickItem *ascendant);
     void _q_parentStyleChanged();
@@ -52,11 +47,15 @@
 
     QQmlComponent *style() const;
     void setStyle(QQmlComponent *style);
+    void resetStyle();
     QQuickItem *styleInstance();
 
+    QString styleName() const;
+    void setStyleName(const QString &name);
+
     virtual void preStyleChanged();
-    virtual void postStyleChanged();
-    virtual void loadStyleItem(bool animated = true);
+    virtual void postStyleChanged() {}
+    virtual bool loadStyleItem(bool animated = true);
 
     UCTheme *getTheme() const;
     void setTheme(UCTheme *theme);
@@ -67,7 +66,7 @@
 
 public:
     bool activeFocusOnPress:1;
-    StyleLoadingMethod styleLoadingMethod;
+    QString styleDocument;
     QQmlComponent *styleComponent;
     QPointer<QQmlContext> styleItemContext;
     QQuickItem *styleItem;

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2015-05-02 09:20:35 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2015-06-01 10:41:20 +0000
@@ -121,15 +121,18 @@
  * }
  * \endqml
  *
- * The \l createStyleComponent function can be used to create the style for a
- * component. The following example will create the style with the inherited
- * theme.
+ * The style can be set on a StyledItem either using \l StyledItem::styleName or
+ * \l StyledItem::style properties. When set through \l StyledItem::styleName,
+ * the component will load the style from the current theme set, and must be a
+ * QML document. The \l StyledItem::style property is a Component which can be
+ * declared local, or loaded with a Loader or created using Qt.createComponent()
+ * function.
+ * The following example will create the style with the inherited theme.
  * \qml
  * import QtQuick 2.4
  * import Ubuntu.Components 1.3
  * StyledItem {
- *     id: myItem
- *     style: theme.createStyleComponent("MyItemStyle.qml", myItem)
+ *     styleName: "MyItemStyle"
  * }
  * \endqml
  * All styled toolkit components such as \l Button, \l CheckBox, \l Switch, etc.
@@ -642,24 +645,20 @@
     }
     m_version = version;
     Q_EMIT versionChanged();
-    // emit also nameChanged() so we reload the theme/style
-    Q_EMIT nameChanged();
 }
 
-/*!
- * \qmlmethod Component ThemeSettings::createStyleComponent(string styleName, object parent)
+/*
  * Returns an instance of the style component named \a styleName and parented
  * to \a parent.
  */
-QQmlComponent* UCTheme::createStyleComponent(const QString& styleName, QObject* parent)
-{
-    return createStyleComponent(styleName, parent, m_version);
-}
-
 QQmlComponent* UCTheme::createStyleComponent(const QString& styleName, QObject* parent, quint16 version)
 {
     QQmlComponent *component = NULL;
 
+    if (!version) {
+        version = m_version;
+    }
+
     if (parent != NULL) {
         QQmlEngine* engine = qmlEngine(parent);
         if (engine != m_engine && !m_engine) {
@@ -681,6 +680,9 @@
                     qmlInfo(parent) << component->errorString();
                     delete component;
                     component = NULL;
+                } else {
+                    // set context for the component
+                    QQmlEngine::setContextForObject(component, qmlContext(parent));
                 }
             } else {
                 qmlInfo(parent) <<

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.h'
--- modules/Ubuntu/Components/plugin/uctheme.h	2015-05-02 08:49:38 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.h	2015-06-01 10:41:20 +0000
@@ -76,8 +76,7 @@
     void setVersion(quint16 version);
 
     // internal, used by the deprecated Theme.createStyledComponent()
-    QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent, quint16 version);
-    Q_INVOKABLE QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent);
+    QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent, quint16 version = 0);
     static void registerToContext(QQmlContext* context);
 
     // helper functions

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2015-06-01 10:41:20 +0000
@@ -94,6 +94,7 @@
     def setUp(self):
         super().setUp()
         self.launch_application()
+        self.pointing_device = Pointer(self.input_device_class.create())
 
     def launch_application(self):
         fake_application = fixture_setup.FakeApplication(
@@ -130,8 +131,6 @@
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
-        self.pointing_device = Pointer(self.input_device_class.create())
-
     @property
     def main_view(self):
         """
@@ -149,44 +148,20 @@
     UP, DOWN, LEFT, RIGHT = range(0, 4)
 
 
-class QMLFileAppTestCase(base.UbuntuUIToolkitAppTestCase):
+class QMLFileAppTestCase(UbuntuUIToolkitWithFakeAppRunningTestCase):
     """Base test case for self tests that launch a QML file."""
 
     test_qml_file_path = '/path/to/file.qml'
     desktop_file_path = None
 
     def setUp(self):
+        with open(self.test_qml_file_path) as qml_file:
+            self.test_qml = qml_file.read()
         super().setUp()
-        self.pointing_device = Pointer(self.input_device_class.create())
-        self.launch_application()
 
     def get_command_line(self, command_line):
         return command_line
 
-    def launch_application(self):
-        desktop_file_path = self._get_desktop_file_path()
-        command_line = [
-            base.get_toolkit_launcher_command(),
-            "-I", _get_module_include_path(),
-            self.test_qml_file_path,
-            '--desktop_file_hint={0}'.format(desktop_file_path)
-            ]
-        self.app = self.launch_test_application(
-            *self.get_command_line(command_line),
-            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase,
-            app_type='qt')
-
-        self.assertThat(
-            self.main_view.visible, Eventually(Equals(True)))
-
-    def _get_desktop_file_path(self):
-        if self.desktop_file_path is None:
-            desktop_file_path = _write_test_desktop_file()
-            self.addCleanup(os.remove, desktop_file_path)
-            return desktop_file_path
-        else:
-            self.desktop_file_path
-
     @property
     def main_view(self):
         """

=== modified file 'tests/resources/navigation/tabs.qml'
--- tests/resources/navigation/tabs.qml	2015-04-24 10:45:31 +0000
+++ tests/resources/navigation/tabs.qml	2015-06-01 10:41:20 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.2
-import Ubuntu.Components.ListItems 1.0 as ListItem
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
 
 MainView {
     width: 800

=== modified file 'tests/unit/tst_performance/PaletteConfigurationAllColors.qml'
--- tests/unit/tst_performance/PaletteConfigurationAllColors.qml	2015-03-19 11:21:42 +0000
+++ tests/unit/tst_performance/PaletteConfigurationAllColors.qml	2015-06-01 10:41:20 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Themes 1.0
+import Ubuntu.Components.Themes 1.3
 
 StyledItem {
     width: 100

=== modified file 'tests/unit/tst_performance/PaletteConfigurationOneColor.qml'
--- tests/unit/tst_performance/PaletteConfigurationOneColor.qml	2015-03-19 11:21:42 +0000
+++ tests/unit/tst_performance/PaletteConfigurationOneColor.qml	2015-06-01 10:41:20 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.3
-import Ubuntu.Components.Themes 1.0
+import Ubuntu.Components.Themes 1.3
 
 StyledItem {
     width: 100

=== modified file 'tests/unit_x11/tst_components/tst_actionbar.qml'
--- tests/unit_x11/tst_components/tst_actionbar.qml	2015-05-14 21:41:16 +0000
+++ tests/unit_x11/tst_components/tst_actionbar.qml	2015-06-01 10:41:20 +0000
@@ -30,7 +30,7 @@
         },
         Action {
             iconName: "appointment"
-            text: "Appointment"
+            text: "Date"
         },
         Action {
             iconName: "attachment"

=== modified file 'tests/unit_x11/tst_components/tst_header_presets.qml'
--- tests/unit_x11/tst_components/tst_header_presets.qml	2015-03-03 13:20:06 +0000
+++ tests/unit_x11/tst_components/tst_header_presets.qml	2015-06-01 10:41:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -35,6 +35,13 @@
                     objectName: "selectAction"
                     text: "Select all"
                     iconName: "select"
+                    onTriggered: {
+                        if (page.head.preset === "") {
+                            page.head.preset = "select";
+                        } else {
+                            page.head.preset = "";
+                        }
+                    }
                 }
             ]
         }

=== modified file 'tests/unit_x11/tst_subtheming/DeprecatedTheme.qml'
--- tests/unit_x11/tst_subtheming/DeprecatedTheme.qml	2015-05-01 11:32:48 +0000
+++ tests/unit_x11/tst_subtheming/DeprecatedTheme.qml	2015-06-01 10:41:20 +0000
@@ -21,5 +21,5 @@
     width: units.gu(40)
     height: units.gu(40)
     theme.name: "Ubuntu.Components.Themes.SuruGradient"
-    style: theme.createStyleComponent("OptionSelectorStyle.qml", item)
+    styleName: "OptionSelectorStyle"
 }

=== modified file 'tests/unit_x11/tst_subtheming/SimpleItem.qml'
--- tests/unit_x11/tst_subtheming/SimpleItem.qml	2015-03-12 20:11:38 +0000
+++ tests/unit_x11/tst_subtheming/SimpleItem.qml	2015-06-01 10:41:20 +0000
@@ -17,13 +17,9 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 
-Item {
+StyledItem {
     id: item
-    property ThemeSettings theme: ThemeSettings {}
-    property Component style
-
-    property string styleDocument
-    onStyleDocumentChanged: style = theme.createStyleComponent(styleDocument, item)
+    theme: ThemeSettings {}
 
     property string themeName
     onThemeNameChanged: theme.name = themeName;

=== added file 'tests/unit_x11/tst_subtheming/StyleKept.qml'
--- tests/unit_x11/tst_subtheming/StyleKept.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/StyleKept.qml	2015-06-01 10:41:20 +0000
@@ -0,0 +1,43 @@
+/*
+ * 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
+
+Item {
+    width: units.gu(40)
+    height: units.gu(40)
+
+    Button {
+        objectName: "TestButton"
+        text: "PressMe..."
+        style: Rectangle {
+            objectName: "TestStyle"
+            // FIXME: move these properties to the Style API
+            property color defaultColor: "blue"
+            property Gradient defaultGradient
+            property font defaultFont
+
+            anchors.fill: styledItem
+            color: defaultColor
+            Label {
+                anchors.fill: parent
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                text: styledItem.text
+            }
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/StyleOverride.qml'
--- tests/unit_x11/tst_subtheming/StyleOverride.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/StyleOverride.qml	2015-06-01 10:41:20 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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
+
+Item {
+    width: units.gu(40)
+    height: units.gu(40)
+
+    Button {
+        objectName: "TestButton"
+        text: "PressMe..."
+    }
+
+    property Component customStyle: Component {
+        Rectangle {
+            objectName: "TestStyle"
+            // FIXME: move these properties to the Style API
+            property color defaultColor: "blue"
+            property Gradient defaultGradient
+            property font defaultFont
+
+            anchors.fill: styledItem
+            color: defaultColor
+            Label {
+                anchors.fill: parent
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                text: styledItem.text
+            }
+        }
+    }
+}

=== modified file 'tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml'
--- tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml	2015-04-27 16:25:09 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemAppThemeFallback.qml	2015-06-01 10:41:20 +0000
@@ -20,5 +20,5 @@
     id: item
     theme.name: "themes.CustomTheme"
     theme.version: Ubuntu.version(1, 0)
-    style: theme.createStyleComponent("TestStyle.qml", item)
+    styleName: "TestStyle"
 }

=== modified file 'tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml'
--- tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml	2015-05-02 09:20:35 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemAppThemeVersioned.qml	2015-06-01 10:41:20 +0000
@@ -20,5 +20,5 @@
     id: item
     theme.name: "themes.CustomTheme"
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("TestStyle.qml", item)
+    styleName: "TestStyle"
 }

=== modified file 'tests/unit_x11/tst_subtheming/StyledItemFallback.qml'
--- tests/unit_x11/tst_subtheming/StyledItemFallback.qml	2015-04-27 14:46:31 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemFallback.qml	2015-06-01 10:41:20 +0000
@@ -20,5 +20,5 @@
     id: item
     theme.name: "TestModule.TestTheme"
     theme.version: Ubuntu.version(1, 0)
-    style: theme.createStyleComponent("TestStyle.qml", item)
+    styleName: "TestStyle"
 }

=== modified file 'tests/unit_x11/tst_subtheming/StyledItemV12.qml'
--- tests/unit_x11/tst_subtheming/StyledItemV12.qml	2015-04-27 12:46:28 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemV12.qml	2015-06-01 10:41:20 +0000
@@ -20,5 +20,5 @@
     id: item
     theme.name: "themes.CustomTheme"
     theme.version: Ubuntu.version(1, 2)
-    style: theme.createStyleComponent("TestStyle.qml", item)
+    styleName: "TestStyle"
 }

=== modified file 'tests/unit_x11/tst_subtheming/StyledItemV13.qml'
--- tests/unit_x11/tst_subtheming/StyledItemV13.qml	2015-04-27 12:46:28 +0000
+++ tests/unit_x11/tst_subtheming/StyledItemV13.qml	2015-06-01 10:41:20 +0000
@@ -20,5 +20,5 @@
     id: item
     theme.name: "themes.CustomTheme"
     theme.version: Ubuntu.toolkitVersion
-    style: theme.createStyleComponent("TestStyle.qml", item)
+    styleName: "TestStyle"
 }

=== modified file 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2/TestStyle.qml'
--- tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2/TestStyle.qml	2015-04-27 12:46:28 +0000
+++ tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.2/TestStyle.qml	2015-06-01 10:41:20 +0000
@@ -17,4 +17,5 @@
 import QtQuick 2.0
 
 Item {
+    objectName: "TestStyle"
 }

=== modified file 'tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.3/TestStyle.qml'
--- tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.3/TestStyle.qml	2015-04-25 06:35:16 +0000
+++ tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/1.3/TestStyle.qml	2015-06-01 10:41:20 +0000
@@ -17,5 +17,6 @@
 import QtQuick 2.0
 
 Item {
+    objectName: "TestStyle"
     property string newProperty: "version1.3"
 }

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-05-02 09:20:35 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-06-01 10:41:20 +0000
@@ -21,6 +21,7 @@
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
 #include "uctheme.h"
+#include "quickutils.h"
 #include "uctestcase.h"
 #include "ucstyleditembase_p.h"
 #include "ucnamespace.h"
@@ -62,12 +63,6 @@
         QTest::waitForEvents();
     }
 
-    void setStyle(const QString &style)
-    {
-        rootObject()->setProperty("styleDocument", style);
-        QTest::waitForEvents();
-    }
-
     UCTheme *theme()
     {
         return rootObject()->property("theme").value<UCTheme*>();
@@ -134,25 +129,27 @@
         QTest::addColumn<QString>("styleName");
         QTest::addColumn<QString>("parentName");
         QTest::addColumn<bool>("success");
-        QTest::newRow("Existing style") << "TestStyle.qml" << "SimpleItem.qml" << true;
-        QTest::newRow("Non existing style") << "NotExistingTestStyle.qml" << "SimpleItem.qml" << false;
+        QTest::addColumn<QString>("warning");
+        QTest::newRow("Existing style") << "TestStyle" << "SimpleItem.qml" << true << QString();
+        QTest::newRow("Non existing style") << "NotExistingTestStyle" << "SimpleItem.qml" << false << "QML SimpleItem: Warning: Style NotExistingTestStyle.qml not found in theme TestModule.TestTheme";
     }
     void test_create_style_component()
     {
         QFETCH(QString, styleName);
         QFETCH(QString, parentName);
         QFETCH(bool, success);
+        QFETCH(QString, warning);
 
-        if (styleName == "NotExistingTestStyle.qml") {
-            ThemeTestCase::ignoreWarning(parentName, 20, 1, "QML SimpleItem: Warning: Style NotExistingTestStyle.qml not found in theme TestModule.TestTheme");
+        if (!warning.isEmpty()) {
+            ThemeTestCase::ignoreWarning(parentName, 20, 1, warning);
         }
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes");
 
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase(parentName));
         view->setTheme("TestModule.TestTheme");
-        view->setStyle(styleName);
-        QQmlComponent *style = view->rootObject()->property("style").value<QQmlComponent*>();
-        QCOMPARE(style != NULL, success);
+        view->rootObject()->setProperty("styleName", styleName);
+        QQuickItem *testStyle = view->rootObject()->findChild<QQuickItem*>("TestStyle");
+        QCOMPARE(testStyle != NULL, success);
     }
 
     void test_relative_theme_paths_environment_variables_data()
@@ -166,23 +163,23 @@
 
         QTest::newRow("One toolkit theme path")
                 << "./themes" << ""
-                << "TestModule.TestTheme" << "TestStyle.qml"
+                << "TestModule.TestTheme" << "TestStyle"
                 << "" << true;
         QTest::newRow("Two toolkit theme paths")
                 << "./themes:./themes/TestModule" << ""
-                << "CustomTheme" << "TestStyle.qml"
+                << "CustomTheme" << "TestStyle"
                 << "" << true;
         QTest::newRow("One XDG path")
                 << "" << "./themes"
-                << "TestModule.TestTheme" << "TestStyle.qml"
+                << "TestModule.TestTheme" << "TestStyle"
                 << "" << true;
         QTest::newRow("Two XDG paths")
                 << "" << "./themes:./themes/TestModule"
-                << "CustomTheme" << "TestStyle.qml"
+                << "CustomTheme" << "TestStyle"
                 << "" << true;
         QTest::newRow("No variables")
                 << "" << ""
-                << QString() << "TestStyle.qml"
+                << QString() << "TestStyle"
                 << "QML SimpleItem: Warning: Style TestStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance" << false;
     }
 
@@ -206,9 +203,9 @@
         if (!theme.isEmpty()) {
             view->setTheme(theme);
         }
-        view->setStyle(style);
-        QQmlComponent *styleComponent = view->rootObject()->property("style").value<QQmlComponent*>();
-        QCOMPARE(styleComponent != NULL, success);
+        view->rootObject()->setProperty("styleName", style);
+        QQuickItem *styleItem = view->rootObject()->findChild<QQuickItem*>("TestStyle");
+        QCOMPARE(styleItem != NULL, success);
     }
 
     void test_import_path()
@@ -662,7 +659,7 @@
         qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
         qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule");
         if (!warning.isEmpty()) {
-            ThemeTestCase::ignoreWarning(document, row, column, warning, 2);
+            ThemeTestCase::ignoreWarning(document, row, column, warning);
         }
         QScopedPointer<ThemeTestCase> view(new ThemeTestCase(document));
         UCStyledItemBase *styledItem = qobject_cast<UCStyledItemBase*>(view->rootObject());
@@ -683,6 +680,67 @@
         // which will cause a warning; therefore we mark the warning to be ignored
         ThemeTestCase::ignoreWarning("DeprecatedTheme.qml", 19, 1, "QML StyledItem: Theme 'Ubuntu.Components.Themes.Ambiance' has no 'OptionSelectorStyle.qml' style for version 1.0, fall back to version 1.3.");
     }
+
+    void test_style_change_has_precedence()
+    {
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("StyleOverride.qml"));
+        QQmlComponent *style = view->rootObject()->property("customStyle").value<QQmlComponent*>();
+        QQuickItem *button = view->findItem<QQuickItem*>("TestButton");
+
+        button->setProperty("style", QVariant::fromValue(style));
+        QVERIFY(button->findChild<QQuickItem*>("TestStyle"));
+    }
+
+    void test_style_kept_when_stylename_changes_data()
+    {
+        QTest::addColumn<QString>("styleName");
+
+        QTest::newRow("Empty style name") << QString();
+        QTest::newRow("Any style name") << "Bumblebee";
+    }
+    void test_style_kept_when_stylename_changes()
+    {
+        QFETCH(QString, styleName);
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("StyleKept.qml"));
+        QQuickItem *button = view->findItem<QQuickItem*>("TestButton");
+
+        button->setProperty("styleName", styleName);
+        QVERIFY(button->findChild<QQuickItem*>("TestStyle"));
+    }
+
+    void test_style_kept_when_theme_changes()
+    {
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("StyleKept.qml"));
+        QQuickItem *button = view->findItem<QQuickItem*>("TestButton");
+        UCTheme *theme = button->property("theme").value<UCTheme*>();
+        QVERIFY(theme);
+
+        theme->setName("Ubuntu.Components.Themes.SuruDark");
+        QVERIFY(button->findChild<QQuickItem*>("TestStyle"));
+    }
+
+    void test_style_reset_to_theme_style()
+    {
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("StyleKept.qml"));
+        UCStyledItemBase *button = view->findItem<UCStyledItemBase*>("TestButton");
+        UCTheme *theme = UCStyledItemBasePrivate::get(button)->getTheme();
+        QVERIFY(theme);
+
+        QVERIFY(button->findChild<QQuickItem*>("TestStyle"));
+        // reset style property, which should reset style to the theme style
+        UCStyledItemBasePrivate::get(button)->resetStyle();
+        QQuickItem *styleItem = UCStyledItemBasePrivate::get(button)->styleInstance();
+        QCOMPARE(QuickUtils::className(styleItem), QString("ButtonStyle"));
+    }
+
+    void test_stylename_extension_failure()
+    {
+        ThemeTestCase::ignoreWarning("DeprecatedTheme.qml", 19, 1, "QML StyledItem: Warning: Style OptionSelectorStyle.qml.qml not found in theme Ubuntu.Components.Themes.SuruGradient");
+        // add also for Ambiance, as ThemeTestCase destructor resets the theme, which will cause style warning for the default theme
+        ThemeTestCase::ignoreWarning("DeprecatedTheme.qml", 19, 1, "QML StyledItem: Warning: Style OptionSelectorStyle.qml.qml not found in theme Ubuntu.Components.Themes.Ambiance");
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("DeprecatedTheme.qml"));
+        view->rootObject()->setProperty("styleName", "OptionSelectorStyle.qml");
+    }
 };
 
 QTEST_MAIN(tst_Subtheming)

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro'
--- tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-05-02 09:20:35 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-06-01 10:41:20 +0000
@@ -31,6 +31,8 @@
     StyledItemFallback.qml \
     StyledItemAppThemeFallback.qml \
     DeprecatedTheme.qml \
-    StyledItemAppThemeVersioned.qml
+    StyledItemAppThemeVersioned.qml \
+    StyleOverride.qml \
+    StyleKept.qml