Merge lp:~bzoltan/ubuntu-ui-toolkit/landing_12-6-2015 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

Landing 12.6.2015

Landing 12.6.2015

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1534
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2211/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3186
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/35/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2678
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3184
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3184/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21166

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2211/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/landing_12-6-2015]

1535. By Zoltan Balogh on 2015-06-16

Sync with staging

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1535
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2212/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/36/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2690
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3201
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21207

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2212/rebuild

review: Needs Fixing (continuous-integration)

[Christian Dywan (kalikiana)]

Rubberstamp.

review: Approve

[lp:~bzoltan/ubuntu-ui-toolkit/landing_12-6-2015]

1536. By Zoltan Balogh on 2015-06-19

sync with the trunk

=== modified file 'components.api'
--- components.api	2015-05-22 11:18:01 +0000
+++ components.api	2015-06-19 04:42:29 +0000
@@ -871,11 +871,14 @@
     property bool iconFrame
     property bool progression
 Ubuntu.Components.StateSaver 1.0 0.1: QtObject
+Ubuntu.Components.StyleHints 1.3: QtObject
+    property bool ignoreUnknownProperties
 Ubuntu.Components.StyledItem 1.3 1.1 1.0 0.1: Item
     property bool activeFocusOnPress
     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 +1201,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 'debian/changelog'
--- debian/changelog	2015-06-15 16:00:12 +0000
+++ debian/changelog	2015-06-19 04:42:29 +0000
@@ -1,3 +1,45 @@
+ubuntu-ui-toolkit (1.3.1534+15.10.20150523-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Christian Dywan ]
+  * Use TextField.write rather than keyboard.type.
+  * Update normal.backgroundText in SuruDark to #5D5D5D. Fixes LP: #1413801.
+  * Fix "runtest.sh: line 78: [: -eq: unary operator expected]".
+  * Consider caret visibility to decide text menu anchor. Fixes LP: #1462419.
+  * Remove text from header textinput AP test QML. Fixes LP: #1459632.
+  * No deprecation notes for our own components. Fixes LP: #1457528.
+ 
+  [ Leonardo Arias Fonseca ]
+  * Add url protocols to the fake application.
+  * Adds a dependency to url-dispatcher-tools in ubuntu-ui-toolkit-autopilot.
+  * Use the test launcher for all the toolkit autopilot tests.
+ 
+  [ Zsombor Egri ]
+  * Remove property bindings before property write does it. Fixes LP: #1462738.
+  * Introducing StyleHints to provide style specific property changes.
+  * Remove ThemeSettings.createStyleComponent() and add styleName to StyledItem.
+    Fixes LP: #1458845.
+ 
+  [ Loïc Molinari ]
+  * [UbuntuShape] Computed dfdt factors based on window content orientation.
+  * Previous logic was based on screen orientation which is not in sync with 
+    OrientationHelper.qml. Fixes LP: #1455567.
+ 
+  [ Timo Jyrinki ] 
+  * Change -html documentation runtime dependencies into Suggests only to limit
+    ubuntu-sdk download size. We're switching to offering only .qch offline 
+    documentation in SDK (inside of it), and they're being added to the seed. 
+    Fixes LP: #1461034.
+  * Licensecheck started complaining about a person name, change to Canonical. 
+    Fixes LP: #1464549
+ 
+  [ Andrea Bernabei ]
+  * Modify ListItem.Caption label margins. Fixes LP: #1314672.
+ 
+  [ Tim Peeters ]
+  * Introduce IconButtonStyle. 
+
+ -- Zoltán Balogh <[e-mail]>  Fri, 12 Jun 2015 11:49:32 +0300
+
 ubuntu-ui-toolkit (1.3.1517+15.10.20150523-0ubuntu3) wily; urgency=medium
 
   * Rebuild against Qt 5.4.2

=== modified file 'debian/control'
--- debian/control	2015-05-20 15:36:55 +0000
+++ debian/control	2015-06-19 04:42:29 +0000
@@ -97,12 +97,12 @@
 Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         qtdeclarative5-doc-html,
-         qtwebkit5-doc-html,
-         qtsvg5-doc-html,
-         qtscript5-doc-html,
-         qtmultimedia5-doc-html,
-         unity-action-doc,
+Suggests: qtdeclarative5-doc-html,
+          qtwebkit5-doc-html,
+          qtsvg5-doc-html,
+          qtscript5-doc-html,
+          qtmultimedia5-doc-html,
+          unity-action-doc,
 Conflicts: qt-components-ubuntu-doc
 Replaces: qt-components-ubuntu-doc
 Provides: qt-components-ubuntu-doc
@@ -149,6 +149,7 @@
          qttestability-autopilot,
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
          upstart,
+         url-dispatcher-tools,
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= ${source:Version}) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
          qml-module-qttest | qtdeclarative5-test-plugin,
 Description: Test package for Ubuntu UI Toolkit

=== modified file 'documentation/ubuntu-theming.qdoc'
--- documentation/ubuntu-theming.qdoc	2015-05-04 10:58:14 +0000
+++ documentation/ubuntu-theming.qdoc	2015-06-19 04:42:29 +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 'examples/ubuntu-ui-toolkit-gallery/Dialog.qml'
--- examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-04-29 08:55:31 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-06-19 04:42:29 +0000
@@ -43,6 +43,10 @@
                 title: "Sample Dialog"
                 text: "Descriptive text goes here"
 
+                TextField {
+                    placeholderText: "Type like your lifes depends on it"
+                }
+
                 Row {
                     id: row
                     width: parent.width

=== 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-19 04:42:29 +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.2/TextCursor.qml'
--- modules/Ubuntu/Components/1.2/TextCursor.qml	2015-05-18 05:37:17 +0000
+++ modules/Ubuntu/Components/1.2/TextCursor.qml	2015-06-19 04:42:29 +0000
@@ -110,7 +110,7 @@
 
         // if the cursor is out of the visible viewport, anchor the
         // contextual menu to the input field
-        var anchor = fakeCursor.visible ? draggedItem : handler.main
+        var anchor = caret.visible ? draggedItem : handler.main
         var popup = PopupUtils.open(component, anchor, {
             "target": handler.main,
         });

=== 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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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.
@@ -111,7 +111,7 @@
 
         // if the cursor is out of the visible viewport, anchor the
         // contextual menu to the input field
-        var anchor = fakeCursor.visible ? draggedItem : handler.main
+        var anchor = caret.visible ? draggedItem : handler.main
         var popup = PopupUtils.open(component, anchor, {
             "target": handler.main,
         });

=== 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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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/Themes/SuruDark/1.2/Palette.qml'
--- modules/Ubuntu/Components/Themes/SuruDark/1.2/Palette.qml	2015-04-24 14:48:00 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/1.2/Palette.qml	2015-06-19 04:42:29 +0000
@@ -21,7 +21,7 @@
 Palette {
     normal: PaletteValues {
         background: "#221E1C"
-        backgroundText: "#33F3F3E7"
+        backgroundText: "#5D5D5D78"
         base: "#19000000"
         baseText: "#FFFFFF"
         foreground: "#888888"

=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml'
--- modules/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml	2015-04-24 14:34:39 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/1.3/Palette.qml	2015-06-19 04:42:29 +0000
@@ -22,7 +22,7 @@
 Palette {
     normal {
         background: "#221E1C"
-        backgroundText: "#33F3F3E7"
+        backgroundText: "#5D5D5D78"
         base: "#19000000"
         baseText: "#FFFFFF"
         foreground: "#888888"

=== 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-19 04:42:29 +0000
@@ -50,6 +50,7 @@
 #include "ucinversemouse.h"
 #include "sortfiltermodel.h"
 #include "ucstyleditembase.h"
+#include "ucstylehints.h"
 #include "ucaction.h"
 #include "ucactioncontext.h"
 #include "ucactionmanager.h"
@@ -210,6 +211,8 @@
     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");
+    qmlRegisterCustomType<UCStyleHints>(uri, 1, 3, "StyleHints", new UCStyleHintsParser);
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2015-03-13 09:27:53 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2015-06-19 04:42:29 +0000
@@ -80,7 +80,8 @@
     privates/listitemdraghandler.h \
     ucnamespace.h \
     ucdeprecatedtheme.h \
-    ucdefaulttheme.h
+    ucdefaulttheme.h \
+    ucstylehints.h
 
 SOURCES += plugin.cpp \
     uctheme.cpp \
@@ -128,7 +129,8 @@
     privates/listitemdraghandler.cpp \
     ucnamespace.cpp \
     ucdeprecatedtheme.cpp \
-    ucdefaulttheme.cpp
+    ucdefaulttheme.cpp \
+    ucstylehints.cpp
 
 # adapters
 SOURCES += adapters/alarmsadapter_organizer.cpp

=== modified file 'modules/Ubuntu/Components/plugin/propertychange_p.cpp'
--- modules/Ubuntu/Components/plugin/propertychange_p.cpp	2015-01-27 18:14:44 +0000
+++ modules/Ubuntu/Components/plugin/propertychange_p.cpp	2015-06-19 04:42:29 +0000
@@ -28,6 +28,7 @@
 PropertyChange::PropertyChange(QObject *item, const char *property, bool autoBackup)
     : backedUp(false)
     , qmlProperty(item, property, qmlContext(item))
+    , backupBinding(Q_NULLPTR)
 {
     if (autoBackup) {
         backup();
@@ -41,6 +42,7 @@
 void PropertyChange::backup()
 {
     if (!backedUp) {
+        backupBinding = QQmlPropertyPrivate::setBinding(qmlProperty, Q_NULLPTR);
         backupValue = qmlProperty.read();
         backedUp = true;
     }
@@ -56,11 +58,24 @@
         return;
     }
     change->backup();
-    // write using QQmlPropertyPrivate so we can keep the bindings
-    QQmlPropertyPrivate::write(change->qmlProperty,
-                               value,
-                               QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
-}
+    change->qmlProperty.write(value);
+}
+
+/*
+ * Same as setValue() but setting a binding.
+ */
+void PropertyChange::setBinding(PropertyChange *change, QQmlAbstractBinding *binding)
+{
+   if (!change) {
+       return;
+   }
+   change->backup();
+   QQmlAbstractBinding *prev = QQmlPropertyPrivate::setBinding(change->qmlProperty, binding);
+   if (prev && prev != binding && prev != change->backupBinding) {
+       prev->destroy();
+   }
+}
+
 
 /*
  * Restore backed up value or binding.
@@ -71,10 +86,16 @@
         return;
     }
     if (change->backedUp) {
-        // write using QQmlPropertyPrivate to keep the bindings
-        QQmlPropertyPrivate::write(change->qmlProperty,
-                                   change->backupValue,
-                                   QQmlPropertyPrivate::BypassInterceptor | QQmlPropertyPrivate::DontRemoveBinding);
+        if (change->qmlProperty.isValid()) {
+            if (change->backupBinding) {
+                QQmlAbstractBinding *prev = QQmlPropertyPrivate::setBinding(change->qmlProperty, change->backupBinding);
+                if (prev != change->backupBinding && prev) {
+                    prev->destroy();
+                }
+            } else {
+                change->qmlProperty.write(change->backupValue);
+            }
+        }
         change->backedUp = false;
     }
 }

=== modified file 'modules/Ubuntu/Components/plugin/propertychange_p.h'
--- modules/Ubuntu/Components/plugin/propertychange_p.h	2015-01-27 18:14:44 +0000
+++ modules/Ubuntu/Components/plugin/propertychange_p.h	2015-06-19 04:42:29 +0000
@@ -21,6 +21,7 @@
 #include <QtCore/QObject>
 #include <QtQml/QQmlProperty>
 
+class QQmlAbstractBinding;
 class PropertyChange
 {
 public:
@@ -28,11 +29,19 @@
     ~PropertyChange();
 
     static void setValue(PropertyChange* change, const QVariant &value);
+    static void setBinding(PropertyChange *change, QQmlAbstractBinding *binding);
     static void restore(PropertyChange* change);
+
+    const QQmlProperty &property()
+    {
+        return qmlProperty;
+    }
+
 private:
     bool backedUp;
     QQmlProperty qmlProperty;
     QVariant backupValue;
+    QQmlAbstractBinding *backupBinding;
 
     void backup();
 };

=== 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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +0000
@@ -19,12 +19,12 @@
 #include "ucstyleditembase.h"
 #include "ucstyleditembase_p.h"
 #include "uctheme.h"
+#include "ucstylehints.h"
 #include <QtQml/QQmlEngine>
 #include <QtQuick/private/qquickanchors_p.h>
 
 UCStyledItemBasePrivate::UCStyledItemBasePrivate()
     : activeFocusOnPress(false)
-    , styleLoadingMethod(Immediate)
     , styleComponent(0)
     , styleItemContext(0)
     , styleItem(0)
@@ -41,8 +41,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 +92,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 +208,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 +244,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 +298,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 +344,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 +359,7 @@
     _q_styleResized();
     connectStyleSizeChanges(true);
     Q_EMIT q->styleInstanceChanged();
+    return true;
 }
 
 /*!
@@ -339,6 +407,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 +476,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 +502,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 +522,13 @@
     postThemeChanged();
 
     Q_EMIT q->themeChanged();
+
+    // perform style reload
+    if (!styleComponent) {
+        preStyleChanged();
+        postStyleChanged();
+        loadStyleItem();
+    }
 }
 void UCStyledItemBasePrivate::resetTheme()
 {
@@ -542,10 +634,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-19 04:42:29 +0000
@@ -23,14 +23,16 @@
 
 class UCStyledItemBasePrivate;
 class UCTheme;
+class UCStyleHints;
 class UCStyledItemBase : public QQuickItem
 {
     Q_OBJECT
     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 +48,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 +63,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-19 04:42:29 +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;

=== added file 'modules/Ubuntu/Components/plugin/ucstylehints.cpp'
--- modules/Ubuntu/Components/plugin/ucstylehints.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/ucstylehints.cpp	2015-06-19 04:42:29 +0000
@@ -0,0 +1,259 @@
+/*
+ * 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 "ucstylehints.h"
+#include "ucstyleditembase_p.h"
+#include "propertychange_p.h"
+#include <QtQml/QQmlInfo>
+
+// verifies property declaration correctness
+void UCStyleHintsParser::verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings)
+{
+    Q_FOREACH(const QV4::CompiledData::Binding *binding, bindings) {
+        verifyProperty(qmlUnit, binding);
+    }
+}
+
+void UCStyleHintsParser::verifyProperty(const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding)
+{
+    if (binding->type == QV4::CompiledData::Binding::Type_Object) {
+        error(qmlUnit->objectAt(binding->value.objectIndex), "StyleHints does not support creating state-specific objects.");
+        return;
+    }
+
+    // group properties or attached properties, we do handle those as well
+    if (binding->type == QV4::CompiledData::Binding::Type_GroupProperty
+            || binding->type == QV4::CompiledData::Binding::Type_AttachedProperty) {
+        const QV4::CompiledData::Object *subObj = qmlUnit->objectAt(binding->value.objectIndex);
+        const QV4::CompiledData::Binding *subBinding = subObj->bindingTable();
+        for (quint32 i = 0; i < subObj->nBindings; ++i, ++subBinding) {
+            verifyProperty(qmlUnit, subBinding);
+        }
+    }
+
+    // filter out signals!
+    QString propertyName = qmlUnit->stringAt(binding->propertyNameIndex);
+    if (propertyName.startsWith("on") && propertyName.at(2).isUpper()) {
+        error(binding, "Signal properties are not supported.");
+        return;
+    }
+}
+
+// decodes property declarations, stores the bindings and values
+void UCStyleHintsParser::applyBindings(QObject *obj, QQmlCompiledData *cdata, const QList<const QV4::CompiledData::Binding *> &bindings)
+{
+    UCStyleHints *hints = static_cast<UCStyleHints*>(obj);
+    QV4::CompiledData::Unit *qmlUnit = cdata->compilationUnit->data;
+
+    UCStyledItemBase *styledItem = qobject_cast<UCStyledItemBase*>(hints->parent());
+    if (!styledItem) {
+        // error will be reported in componentCompleted
+        return;
+    }
+
+    Q_FOREACH(const QV4::CompiledData::Binding *binding, bindings) {
+        hints->decodeBinding(QString(), qmlUnit, binding);
+    }
+
+    hints->m_cdata = cdata;
+    hints->m_decoded = true;
+}
+
+void UCStyleHints::decodeBinding(const QString &propertyPrefix, const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding)
+{
+    QString propertyName = propertyPrefix + qmlUnit->stringAt(binding->propertyNameIndex);
+
+    // handle grouped properties first
+    if (binding->type == QV4::CompiledData::Binding::Type_GroupProperty
+        || binding->type == QV4::CompiledData::Binding::Type_AttachedProperty) {
+
+        const QV4::CompiledData::Object *subObj = qmlUnit->objectAt(binding->value.objectIndex);
+        const QV4::CompiledData::Binding *subBinding = subObj->bindingTable();
+        QString pre = propertyName + ".";
+        for (quint32 i = 0; i < subObj->nBindings; ++i, ++subBinding) {
+            decodeBinding(pre, qmlUnit, subBinding);
+        }
+        return;
+    }
+
+    switch (binding->type) {
+    case QV4::CompiledData::Binding::Type_Script:
+    {
+        QString expression = binding->valueAsScriptString(qmlUnit);
+        QUrl url = QUrl();
+        int line = -1;
+        int column = -1;
+
+        QQmlData *ddata = QQmlData::get(this);
+        if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) {
+            url = ddata->outerContext->url;
+            line = ddata->lineNumber;
+            column = ddata->columnNumber;
+        }
+        m_expressions << Expression(propertyName, binding->value.compiledScriptIndex, expression, url, line, column);
+        break;
+    }
+    case QV4::CompiledData::Binding::Type_Translation:
+    case QV4::CompiledData::Binding::Type_TranslationById:
+    case QV4::CompiledData::Binding::Type_String:
+    {
+        m_values << qMakePair(propertyName, binding->valueAsString(qmlUnit));
+        break;
+    }
+    case QV4::CompiledData::Binding::Type_Number:
+    {
+        m_values << qMakePair(propertyName, binding->valueAsNumber());
+        break;
+    }
+    case QV4::CompiledData::Binding::Type_Boolean:
+    {
+        m_values << qMakePair(propertyName, binding->valueAsBoolean());
+        break;
+    }
+    }
+}
+
+void UCStyleHints::propertyNotFound(const QString &styleName, const QString &property)
+{
+    if (!m_ignoreUnknownProperties) {
+        qmlInfo(this) << QString("Style '%1' has no property called '%2'.").arg(styleName).arg(property);
+    }
+}
+
+/*!
+ * \qmltype StyleHints
+ * \instantiates UCStyleHints
+ * \inmodule Ubuntu Components 1.3
+ * \ingroup ubuntu
+ * \since Ubuntu.Components 1.3
+ * \brief Component holding style specific properties to configure a particular
+ * StyledItem's style runtime.
+ *
+ * StyleHints is a custom parser, meaning style properties can be listed without
+ * any property declaration, same way as in PropertyChanges or Connections, which
+ * are similar custom parsers. Properties enumerated do not have to be present in
+ * the component's style as default, behavior which can be chenged by setting \l
+ * ignoreUnknownProperties to true. In this case properties not found in the style
+ * will be displayed as warnings.
+ *
+ * In the following example the Button will be drawn as white when not pressed, and
+ * colored as blue when pressed.
+ * \qml
+ * Button {
+ *     id: button
+ *     StyleHints {
+ *         defaultColor: button.pressed ? "blue" : "white"
+ *     }
+ * }
+ * \endqml
+ *
+ * StyleHints does not support signal properties (i.e signal handlers) and object
+ * declarations as property values.
+ *
+ * StyleHints can be only declared in a \l StyledItem or as a derivate of it.
+ */
+
+/*!
+ * \qmlproperty bool StyleHints::ignoreUnknownProperties
+ * The property drives whether component should warn on properties not found in
+ * the component's style. The default setting is not to warn.
+ */
+UCStyleHints::UCStyleHints(QObject *parent)
+    : QObject(parent)
+    , m_decoded(false)
+    , m_completed(false)
+    , m_ignoreUnknownProperties(true)
+{
+}
+
+UCStyleHints::~UCStyleHints()
+{
+    qDeleteAll(m_propertyBackup);
+    m_propertyBackup.clear();
+}
+
+void UCStyleHints::classBegin()
+{
+    m_styledItem = qobject_cast<UCStyledItemBase*>(parent());
+    if (m_styledItem) {
+        connect(m_styledItem, SIGNAL(styleInstanceChanged()),
+                this, SLOT(_q_applyStyleHints()));
+    } else {
+        qmlInfo(this) << "StyleHints must be declared in a StyledItem or a derivate of it.";
+    }
+}
+
+void UCStyleHints::componentComplete()
+{
+    m_completed = (m_styledItem != Q_NULLPTR);
+    _q_applyStyleHints();
+}
+
+// apply the style hints and check each property existence
+void UCStyleHints::_q_applyStyleHints()
+{
+    if (!m_completed || !m_decoded || !m_styledItem || !UCStyledItemBasePrivate::get(m_styledItem)->styleItem) {
+        return;
+    }
+
+    // restore properties first
+    qDeleteAll(m_propertyBackup);
+    m_propertyBackup.clear();
+
+    QQuickItem *item = UCStyledItemBasePrivate::get(m_styledItem)->styleItem;
+    const QMetaObject *mo = item->metaObject();
+    const QString styleName = UCStyledItemBasePrivate::get(m_styledItem)->styleName();
+    // apply values first
+    for (int i = 0; i < m_values.size(); i++) {
+        if (mo->indexOfProperty(m_values[i].first.toUtf8()) < 0) {
+            propertyNotFound(styleName, m_values[i].first);
+            continue;
+        }
+        PropertyChange *change = new PropertyChange(item, m_values[i].first.toUtf8());
+        PropertyChange::setValue(change, m_values[i].second);
+        m_propertyBackup << change;
+    }
+
+    QQmlContext *context = qmlContext(this);
+    // then apply expressions/bindings
+    for (int ii = 0; ii < m_expressions.count(); ii++) {
+        Expression e = m_expressions[ii];
+        PropertyChange *change = new PropertyChange(item, e.name.toUtf8());
+        if (!change->property().isValid()) {
+            propertyNotFound(styleName, e.name);
+            delete change;
+            continue;
+        }
+
+        // create a binding object from the expression using the palette context
+        QQmlContextData *cdata = QQmlContextData::get(context);
+        QQmlBinding *newBinding = 0;
+        if (e.id != QQmlBinding::Invalid) {
+            QV4::Scope scope(QQmlEnginePrivate::getV4Engine(qmlEngine(this)));
+            QV4::ScopedValue function(scope, QV4::QmlBindingWrapper::createQmlCallableForFunction(cdata, item, m_cdata->compilationUnit->runtimeFunctions[e.id]));
+            newBinding = new QQmlBinding(function, item, cdata);
+        }
+        if (!newBinding) {
+            newBinding = new QQmlBinding(e.expression, item, cdata, e.url.toString(), e.line, e.column);
+        }
+
+        newBinding->setTarget(change->property());
+        PropertyChange::setBinding(change, newBinding);
+    }
+}
+

=== added file 'modules/Ubuntu/Components/plugin/ucstylehints.h'
--- modules/Ubuntu/Components/plugin/ucstylehints.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/ucstylehints.h	2015-06-19 04:42:29 +0000
@@ -0,0 +1,92 @@
+/*
+ * 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 UCSTYLEHINTS_H
+#define UCSTYLEHINTS_H
+
+#include <QtCore/QObject>
+#define foreach Q_FOREACH
+#include <QtQml/private/qqmlcustomparser_p.h>
+#include <private/qv4engine_p.h>
+#include <private/qpodvector_p.h>
+#undef foreach
+#include <QtQml/private/qqmlcompiler_p.h>
+
+class UCStyleHintsParser;
+class UCStyledItemBase;
+class QQuickItem;
+class PropertyChange;
+class UCStyleHints : public QObject, public QQmlParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(bool ignoreUnknownProperties MEMBER m_ignoreUnknownProperties)
+
+public:
+    explicit UCStyleHints(QObject *parent = 0);
+    ~UCStyleHints();
+
+private Q_SLOTS:
+    void _q_applyStyleHints();
+
+protected:
+    void classBegin();
+    void componentComplete();
+
+private:
+    class Expression {
+    public:
+        Expression(const QString &name, QQmlBinding::Identifier id, const QString& expr,
+                         const QUrl &url, int line, int column)
+            : name(name), id(id), expression(expr), url(url), line(line), column(column) {}
+        QString name;
+        QQmlBinding::Identifier id;
+        QString expression;
+        QUrl url;
+        int line;
+        int column;
+    };
+
+    bool m_decoded:1;
+    bool m_completed:1;
+    bool m_ignoreUnknownProperties:1;
+    QPointer<UCStyledItemBase> m_styledItem;
+    QList<Expression> m_expressions;
+    QList< QPair<QString, QVariant> > m_values;
+    QList< PropertyChange* > m_propertyBackup;
+    QQmlRefPointer<QQmlCompiledData> m_cdata;
+
+    friend class UCStyleHintsParser;
+
+    void propertyNotFound(const QString &styleName, const QString &property);
+    void decodeBinding(const QString &propertyPrefix, const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding);
+};
+
+class UCStyleHintsParser : public QQmlCustomParser
+{
+public:
+    UCStyleHintsParser() : QQmlCustomParser(QQmlCustomParser::AcceptsSignalHandlers) {}
+
+    virtual void verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings);
+    virtual void applyBindings(QObject *obj, QQmlCompiledData *cdata, const QList<const QV4::CompiledData::Binding *> &bindings);
+
+private:
+    void verifyProperty(const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding);
+};
+
+#endif // UCSTYLEHINTS_H

=== 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-19 04:42:29 +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-19 04:42:29 +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 'modules/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-04-30 19:51:26 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-06-19 04:42:29 +0000
@@ -49,36 +49,8 @@
 
 // --- Scene graph shader ---
 
-// Factors used to know which screen-space derivatives must be used in the fragment shaders based on
-// the primary orientation and current orientation.
-static float dfdtFactors[2];
-
-static void orientationChanged(Qt::ScreenOrientation orientation)
-{
-    const quint8 landscapeMask = Qt::LandscapeOrientation | Qt::InvertedLandscapeOrientation;
-    const quint8 portraitMask = Qt::PortraitOrientation | Qt::InvertedPortraitOrientation;
-    if (QGuiApplication::primaryScreen()->primaryOrientation() & landscapeMask) {
-        const quint8 flippedMask =
-            Qt::InvertedLandscapeOrientation | Qt::InvertedPortraitOrientation;
-        dfdtFactors[0] = orientation & landscapeMask ? 0.0f : 1.0f;
-        dfdtFactors[1] = orientation & flippedMask ? -1.0f : 1.0f;
-    } else {
-        const quint8 flippedMask = Qt::InvertedPortraitOrientation | Qt::LandscapeOrientation;
-        dfdtFactors[0] = orientation & portraitMask ? 0.0f : 1.0f;
-        dfdtFactors[1] = orientation & flippedMask ? -1.0f : 1.0f;
-    }
-}
-
 ShapeShader::ShapeShader()
 {
-    static bool once = true;
-    if (once) {
-        const QScreen* primaryScreen = QGuiApplication::primaryScreen();
-        orientationChanged(primaryScreen->orientation());
-        QObject::connect(primaryScreen, &QScreen::orientationChanged, orientationChanged);
-        once = false;
-    }
-
     setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/uc/shaders/shape.vert"));
     setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/uc/shaders/shape.frag"));
 }
@@ -168,9 +140,11 @@
 
     // Send screen-space derivative factors. Note that when rendering is redirected to a
     // ShaderEffectSource (FBO), dFdy() sign is flipped.
-    const bool flipped = dfdtFactors[0] != 1.0f && state.projectionMatrix()(1, 3) < 0.0f;
-    const QVector2D dfdtFactorsVector(dfdtFactors[0], flipped ? -dfdtFactors[1] : dfdtFactors[1]);
-    program()->setUniformValue(m_dfdtFactorsId, dfdtFactorsVector);
+    const float orientation = static_cast<float>(data->dfdtFactors & 0x4);
+    const float flip = static_cast<float>(data->dfdtFactors & 0x3) - 1.0f;
+    const bool flipped = orientation != 1.0f && state.projectionMatrix()(1, 3) < 0.0f;
+    const QVector2D dfdtFactors(orientation, flipped ? -flip : flip);
+    program()->setUniformValue(m_dfdtFactorsId, dfdtFactors);
 
     // Update QtQuick engine uniforms.
     if (state.isMatrixDirty()) {
@@ -272,6 +246,7 @@
 // --- QtQuick item ---
 
 static QHash<QOpenGLContext*, quint32> shapeTextureHash;
+static bool isPrimaryOrientationLandscape = false;
 
 const float implicitWidthGU = 8.0f;
 const float implicitHeightGU = 8.0f;
@@ -331,6 +306,17 @@
     , m_sourceOpacity(255)
     , m_flags(Stretched)
 {
+    static bool once = true;
+    if (once) {
+        // Stored statically as the primary orientation is fixed and we don't support multiple
+        // screens for now.
+        if (QGuiApplication::primaryScreen()->primaryOrientation() &
+            (Qt::LandscapeOrientation | Qt::InvertedLandscapeOrientation)) {
+            isPrimaryOrientationLandscape = true;
+        }
+        once = false;
+    }
+
     setFlag(ItemHasContents);
     QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()), this,
                      SLOT(_q_gridUnitChanged()));
@@ -1236,6 +1222,25 @@
     materialData->distanceAAFactor = qMin(
         (radius / (end - start)) - (start / (end - start)), 1.0f) * 255.0f;
 
+    // Screen-space derivatives factors for fragment shaders depend on the primary orientation and
+    // content orientation. A flag indicating a 90° rotation around the primary orientation is
+    // stored on the 3rd bit of dfdtFactors, the flip factor is stored on the first 2 bits as 0 for
+    // -1 and as 2 for 1 (efficiently converted using: float(x & 0x3) - 1.0f).
+    const Qt::ScreenOrientation contentOrientation = window()->contentOrientation();
+    if (isPrimaryOrientationLandscape) {
+        const quint8 portraitMask = Qt::PortraitOrientation | Qt::InvertedPortraitOrientation;
+        const quint8 flipMask = Qt::InvertedLandscapeOrientation | Qt::InvertedPortraitOrientation;
+        quint8 factors = contentOrientation & portraitMask ? 0x4 : 0x0;
+        factors |= contentOrientation & flipMask ? 0x0 : 0x2;
+        materialData->dfdtFactors = factors;
+    } else {
+        const quint8 landscapeMask = Qt::LandscapeOrientation | Qt::InvertedLandscapeOrientation;
+        const quint8 flipMask = Qt::InvertedPortraitOrientation | Qt::LandscapeOrientation;
+        quint8 factors = contentOrientation & landscapeMask ? 0x4 : 0x0;
+        factors |= contentOrientation & flipMask ? 0x0 : 0x2;
+        materialData->dfdtFactors = factors;
+    }
+
     // When the radius is equal to radiusSizeOffset (which means radius size is 0), no aspect is
     // flagged so that a dedicated (statically flow controlled) shaved off shader can be used for
     // optimal performance.

=== modified file 'modules/Ubuntu/Components/plugin/ucubuntushape.h'
--- modules/Ubuntu/Components/plugin/ucubuntushape.h	2015-04-22 19:33:39 +0000
+++ modules/Ubuntu/Components/plugin/ucubuntushape.h	2015-06-19 04:42:29 +0000
@@ -68,6 +68,7 @@
         quint32 shapeTexture;
         quint8 distanceAAFactor;
         quint8 sourceOpacity;
+        quint8 dfdtFactors;
         quint8 flags;
     };
 

=== modified file 'modules/Ubuntu/Test/plugin/uctestcase.cpp'
--- modules/Ubuntu/Test/plugin/uctestcase.cpp	2014-11-25 09:58:33 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.cpp	2015-06-19 04:42:29 +0000
@@ -32,7 +32,7 @@
  * \ingroup ubuntu
  * \brief UbuntuTestCase is the C++ pendant to the QML UbuntuTestCase.
  */
-UbuntuTestCase::UbuntuTestCase(const QString& file, QWindow* parent) : QQuickView(parent)
+UbuntuTestCase::UbuntuTestCase(const QString& file, bool assertOnFailure, QWindow* parent) : QQuickView(parent)
 {
     QString modules(UBUNTU_QML_IMPORT_PATH);
     Q_ASSERT(QDir(modules).exists());
@@ -45,10 +45,14 @@
 
     Q_ASSERT(!file.isEmpty());
     setSource(QUrl::fromLocalFile(file));
-    Q_ASSERT(status() == QQuickView::Ready);
-    Q_ASSERT(rootObject());
-    show();
-    QTest::qWaitForWindowExposed(this);
+    if (assertOnFailure) {
+        Q_ASSERT(status() == QQuickView::Ready);
+        Q_ASSERT(rootObject());
+    }
+    if (rootObject()) {
+        show();
+        QTest::qWaitForWindowExposed(this);
+    }
 }
 
 /*!

=== modified file 'modules/Ubuntu/Test/plugin/uctestcase.h'
--- modules/Ubuntu/Test/plugin/uctestcase.h	2015-03-06 14:35:53 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.h	2015-06-19 04:42:29 +0000
@@ -28,7 +28,7 @@
 {
     Q_OBJECT
 public:
-    UbuntuTestCase(const QString& file, QWindow* parent = 0);
+    UbuntuTestCase(const QString& file, bool assertOnFailure = true, QWindow* parent = 0);
     int warnings() const;
     // getter
     template<class T>

=== modified file 'tests/apicheck/apicheck.cpp'
--- tests/apicheck/apicheck.cpp	2015-05-11 12:46:48 +0000
+++ tests/apicheck/apicheck.cpp	2015-06-19 04:42:29 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
- * Copyright (C) 2015 Christian Dywan
+ * Copyright (C) 2015 Canonical
  *
  * 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

=== modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2015-06-19 04:42:29 +0000
@@ -15,9 +15,11 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import copy
+import json
 import logging
 import os
 import shutil
+import subprocess
 import tempfile
 
 import fixtures
@@ -44,7 +46,7 @@
 DEFAULT_DESKTOP_FILE_DICT = {
     'Type': 'Application',
     'Name': 'test',
-    'Exec': '{qmlscene} {qml_file_path}',
+    'Exec': '{launcher} {qml_file_path}',
     'Icon': 'Not important'
 }
 
@@ -56,18 +58,24 @@
 
     def __init__(
             self, qml_file_contents=DEFAULT_QML_FILE_CONTENTS,
-            desktop_file_dict=None):
+            desktop_file_dict=None, url_dispatcher_protocols=None):
         super().__init__()
         self._qml_file_contents = qml_file_contents
         if desktop_file_dict is None:
             self._desktop_file_dict = copy.deepcopy(DEFAULT_DESKTOP_FILE_DICT)
         else:
             self._desktop_file_dict = copy.deepcopy(desktop_file_dict)
+        self.url_dispatcher_protocols = url_dispatcher_protocols
 
     def setUp(self):
         super().setUp()
         self.qml_file_path, self.desktop_file_path = (
             self._create_test_application())
+        desktop_file_name = os.path.basename(self.desktop_file_path)
+        self.application_name, _ = os.path.splitext(desktop_file_name)
+        if self.url_dispatcher_protocols:
+            self.url_dispatcher_file_path = (
+                self._register_url_dispatcher_protocols(self.application_name))
 
     def _create_test_application(self):
         qml_file_path = self._write_test_qml_file()
@@ -99,7 +107,7 @@
                                                   dir=desktop_file_dir)
         self._desktop_file_dict['Exec'] = (
             self._desktop_file_dict['Exec'].format(
-                qmlscene=base.get_qmlscene_launch_command(),
+                launcher=base.get_toolkit_launcher_command(),
                 qml_file_path=qml_file_path))
         desktop_file.write('[Desktop Entry]\n')
         for key, value in self._desktop_file_dict.items():
@@ -111,6 +119,42 @@
         return os.path.join(
             os.environ.get('HOME'), '.local', 'share', 'applications')
 
+    def _register_url_dispatcher_protocols(self, application_name):
+        url_dispatcher_file_path = self._write_url_dispatcher_file(
+            application_name)
+        self.addCleanup(os.remove, url_dispatcher_file_path)
+        self._update_url_dispatcher_directory(url_dispatcher_file_path)
+        return url_dispatcher_file_path
+
+    def _write_url_dispatcher_file(self, application_name):
+        url_dispatcher_dir = self._get_local_url_dispatcher_directory()
+        if not os.path.exists(url_dispatcher_dir):
+            os.makedirs(url_dispatcher_dir)
+
+        protocol_list = [
+            {'protocol': protocol}
+            for protocol in self.url_dispatcher_protocols]
+
+        url_dispatcher_file_path = os.path.join(
+            url_dispatcher_dir, application_name + '.url-dispatcher')
+        with open(url_dispatcher_file_path, 'w') as url_dispatcher_file:
+            url_dispatcher_file.write(json.dumps(protocol_list))
+
+        return url_dispatcher_file_path
+
+    def _get_local_url_dispatcher_directory(self):
+        return os.path.join(
+            os.environ.get('HOME'), '.config', 'url-dispatcher', 'urls')
+
+    def _update_url_dispatcher_directory(self, url_dispatcher_file_path):
+        # FIXME This should be updated calling
+        # initctl start url-dispatcher-update-user, but it is not working.
+        # https://bugs.launchpad.net/ubuntu/+source/url-dispatcher/+bug/1461496
+        # --elopio - 2015-06-02
+        subprocess.check_output(
+            '/usr/lib/*/url-dispatcher/update-directory ' +
+            url_dispatcher_file_path, shell=True)
+
 
 class InitctlEnvironmentVariable(fixtures.Fixture):
     """Set the value of initctl environment variables."""

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.header.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.header.qml	2015-03-10 16:29:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.header.qml	2015-06-19 04:42:29 +0000
@@ -37,8 +37,6 @@
             inputMethodHints: Qt.ImhNoPredictiveText
             hasClearButton: false
 
-            text: "Then two bears came out of the woods and mauled forty-two of the youths."
-
             anchors {
                 fill: parent
                 leftMargin: units.gu(1)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-05-18 05:37:17 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-06-19 04:42:29 +0000
@@ -80,9 +80,8 @@
     def test_caret_visible_on_focus(self):
         cursorName = 'text_cursor_style_caret_cursorPosition'
         self._assert_not_visible(objectName=cursorName)
+        self.textfield.write('Lorem ipsum')
         self.pointing_device.click_object(self.textfield)
-        self.assertTrue(self.textfield.focus)
-        self.textfield.keyboard.type('Lorem ipsum')
         self.main_view.select_single(objectName=cursorName)
 
     def test_caret_hide_while_typing(self):
@@ -90,7 +89,7 @@
         self.assertTrue(self.textfield.focus)
         cursor = self.select_cursor('cursorPosition')
 
-        self.textfield.keyboard.type('Lorem ipsum')
+        self.textfield.write('Lorem ipsum')
         self.assertFalse(cursor.visible)
 
     def test_caret_visible_after_tapping(self):
@@ -166,6 +165,7 @@
             objectName=positionProperty + '_draggeditem')
 
     def test_popover_not_obscured(self):
+        self.textfield.write('Lorem ipsum')
         self.pointing_device.click_object(self.textfield)
         cursor = self.select_cursor('cursorPosition')
         self.pointing_device.click_object(cursor)
@@ -184,6 +184,7 @@
 
     def test_popover_visible_after_tapping_caret(self):
         # Insert Mode
+        self.textfield.write('Lorem ipsum')
         self.pointing_device.click_object(self.textfield)
         cursor = self.select_cursor('cursorPosition')
         self.pointing_device.click_object(cursor)
@@ -192,8 +193,7 @@
 
     def test_popover_visible_after_dragging_caret(self):
         # Insert Mode
-        self.pointing_device.click_object(self.textfield)
-        self.textfield.keyboard.type('Lorem ipsum')
+        self.textfield.write('Lorem ipsum')
         self.pointing_device.click_object(self.textfield)
         cursor = self.select_cursor('cursorPosition')
         x, y = get_center_point(cursor)
@@ -204,8 +204,7 @@
     @testtools.skipIf(platform.model() == 'Desktop', 'Touch only')
     def test_popover_visible_after_long_press(self):
         # Select Mode
-        self.pointing_device.click_object(self.textfield)
-        self.textfield.keyboard.type('Lorem ipsum')
+        self.textfield.write('Lorem ipsum')
         self.pointing_device.move(
             self.textfield.globalRect.x + self.textfield.width // 8,
             self.textfield.globalRect.y + self.textfield.height // 2)

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.LaunchFakeApplicationTestCase.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.LaunchFakeApplicationTestCase.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.LaunchFakeApplicationTestCase.qml	2015-06-19 04:42:29 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.2
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    objectName: "mainView"
+
+    Label {
+        id: label
+        objectName: 'testLabel'
+        text: 'Test application.'
+    }
+}

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2015-04-14 21:02:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2015-06-19 04:42:29 +0000
@@ -15,6 +15,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import subprocess
 import tempfile
 
 from unittest import mock
@@ -22,6 +23,7 @@
 import testtools
 from autopilot import (
     display,
+    introspection,
     platform,
     testcase as autopilot_testcase
 )
@@ -78,10 +80,10 @@
         self.assert_desktop_file_contents(
             desktop_file_contents, test_desktop_file_dict)
 
-    def test_desktop_file_with_qmlscene_launch_command(self):
-        test_desktop_file_dict = {'Exec': '{qmlscene} application'}
+    def test_desktop_file_with_launch_command(self):
+        test_desktop_file_dict = {'Exec': '{launcher} application'}
 
-        qmlscene = 'ubuntuuitoolkit.base.get_qmlscene_launch_command'
+        qmlscene = 'ubuntuuitoolkit.base.get_toolkit_launcher_command'
         with mock.patch(qmlscene) as mock_qmlscene:
             mock_qmlscene.return_value = 'test_qmlscene_command'
             fake_application = fixture_setup.FakeApplication(
@@ -111,9 +113,9 @@
                 'Exec=qmlscene {}'.format(fake_application.qml_file_path)))
 
     def test_desktop_file_with_default_contents(self):
-        qmlscene = 'ubuntuuitoolkit.base.get_qmlscene_launch_command'
-        with mock.patch(qmlscene) as mock_qmlscene:
-            mock_qmlscene.return_value = 'qmlscene'
+        get_launcher = 'ubuntuuitoolkit.base.get_toolkit_launcher_command'
+        with mock.patch(get_launcher) as mock_launcher:
+            mock_launcher.return_value = 'testlauncher'
             fake_application = fixture_setup.FakeApplication()
             self.useFixture(fake_application)
 
@@ -124,7 +126,7 @@
             'Type': 'Application',
             'Name': 'test',
             'Icon': 'Not important',
-            'Exec': 'qmlscene {}'.format(fake_application.qml_file_path),
+            'Exec': 'testlauncher {}'.format(fake_application.qml_file_path),
         }
         self.assert_desktop_file_contents(
             desktop_file_contents, expected_desktop_file_dict)
@@ -140,7 +142,8 @@
             os.path.dirname(fake_application.desktop_file_path))
 
     def test_fake_application_files_must_be_removed_after_test(self):
-        fake_application = fixture_setup.FakeApplication()
+        fake_application = fixture_setup.FakeApplication(
+            url_dispatcher_protocols=['testprotocol'])
 
         def inner_test():
             class TestWithFakeApplication(testtools.TestCase):
@@ -151,6 +154,8 @@
         inner_test().run()
         self.assertThat(fake_application.qml_file_path, Not(FileExists()))
         self.assertThat(fake_application.desktop_file_path, Not(FileExists()))
+        self.assertThat(
+            fake_application.url_dispatcher_file_path, Not(FileExists()))
 
 
 class LaunchFakeApplicationTestCase(autopilot_testcase.AutopilotTestCase):
@@ -159,7 +164,7 @@
         fake_application = fixture_setup.FakeApplication()
         self.useFixture(fake_application)
 
-        self.application = self.launch_test_application(
+        application = self.launch_test_application(
             base.get_qmlscene_launch_command(),
             fake_application.qml_file_path,
             '--desktop_file_hint={0}'.format(
@@ -167,7 +172,42 @@
             app_type='qt')
 
         # We can select a component from the application.
-        self.application.select_single('Label', objectName='testLabel')
+        application.select_single('Label', objectName='testLabel')
+
+    def test_launch_fake_application_from_url_dispatcher(self):
+        if platform.model() == 'Desktop':
+            self.skipTest('Not yet working on desktop')
+
+        path = os.path.abspath(__file__)
+        dir_path = os.path.dirname(path)
+        qml_file_path = os.path.join(
+            dir_path, 'test_fixture_setup.LaunchFakeApplicationTestCase.qml')
+        with open(qml_file_path) as qml_file:
+            qml_file_contents = qml_file.read()
+
+        fake_application = fixture_setup.FakeApplication(
+            qml_file_contents=qml_file_contents,
+            url_dispatcher_protocols=['testprotocol'])
+        self.useFixture(fake_application)
+
+        self.useFixture(fixture_setup.InitctlEnvironmentVariable(
+            QT_LOAD_TESTABILITY=1))
+
+        self.addCleanup(
+            subprocess.check_output,
+            ['ubuntu-app-stop', fake_application.application_name])
+
+        subprocess.check_output(
+            ['url-dispatcher', 'testprotocol://test'])
+
+        pid = int(subprocess.check_output(
+            ['ubuntu-app-pid', fake_application.application_name]).strip())
+
+        application = introspection.get_proxy_object_for_existing_process(
+            pid=pid)
+
+        # We can select a component from the application.
+        application.select_single('Label', objectName='testLabel')
 
 
 class InitctlEnvironmentVariableTestCase(testtools.TestCase):

=== 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-19 04:42:29 +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/runtest.sh'
--- tests/unit/runtest.sh	2015-05-05 09:06:13 +0000
+++ tests/unit/runtest.sh	2015-06-19 04:42:29 +0000
@@ -64,21 +64,20 @@
     QML2_IMPORT_PATH=${_IMPORT_PATH} UBUNTU_UI_TOOLKIT_THEMES_PATH=${_THEMES_PATH} \
     ALARM_BACKEND=memory SUPPRESS_DEPRECATED_NOTE=yes \
     $_CMD $_ARGS 2>&1 | grep -v 'QFontDatabase: Cannot find font directory'
-    RESULT=0
     if [ "x$UITK_TEST_KEEP_RUNNING" != "x1" ]; then
         ${BUILD_DIR}/tests/checkresults.sh $_XML
         RESULT=$*
     fi
   else
     echo "Skipped because no DISPLAY available"
+  fi
+  if [ -z $RESULT ]; then
     RESULT=0
-  fi
   # segfault
-  if [ $RESULT -eq 139 ]; then
+  elif [ $RESULT -eq 139 ]; then
     RESULT=2
-  fi
   # abort
-  if [ $RESULT -eq 134 ]; then
+  elif [ $RESULT -eq 134 ]; then
     RESULT=2
   fi
   echo "$_TARGET_$_TESTFILE exited with $RESULT"

=== 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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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"
 }

=== added file 'tests/unit_x11/tst_subtheming/GroupPropertyBindingHints.qml'
--- tests/unit_x11/tst_subtheming/GroupPropertyBindingHints.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/GroupPropertyBindingHints.qml	2015-06-19 04:42:29 +0000
@@ -0,0 +1,32 @@
+/*
+ * 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(71)
+
+    HintedButton {
+        objectName: "Button"
+        id: button
+        gradient: UbuntuColors.greyGradient
+        StyleHints {
+            gradientProxy.topColor: button.pressed ? "tan" : "blue"
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/HintedButton.qml'
--- tests/unit_x11/tst_subtheming/HintedButton.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/HintedButton.qml	2015-06-19 04:42:29 +0000
@@ -0,0 +1,24 @@
+/*
+ * 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
+
+Button {
+    StyleHints {
+        minimumWidth: units.gu(20)
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/MoreStyleHints.qml'
--- tests/unit_x11/tst_subtheming/MoreStyleHints.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/MoreStyleHints.qml	2015-06-19 04:42:29 +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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Button {
+        objectName: "Button"
+        StyleHints {
+            minimumWidth: units.gu(20)
+        }
+
+        StyleHints {
+            defaultColor: "brown"
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/OverrideStyleHints.qml'
--- tests/unit_x11/tst_subtheming/OverrideStyleHints.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/OverrideStyleHints.qml	2015-06-19 04:42:29 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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(71)
+
+    HintedButton {
+        objectName: "Button"
+        StyleHints {
+            minimumWidth: 5
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/PropertyBindingHints.qml'
--- tests/unit_x11/tst_subtheming/PropertyBindingHints.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/PropertyBindingHints.qml	2015-06-19 04:42:29 +0000
@@ -0,0 +1,31 @@
+/*
+ * 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(71)
+
+    Button {
+        objectName: "Button"
+        id: button
+        StyleHints {
+            defaultColor: button.pressed ? "tan" : "blue"
+        }
+    }
+}

=== 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-19 04:42:29 +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/SimplePropertyHints.qml'
--- tests/unit_x11/tst_subtheming/SimplePropertyHints.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/SimplePropertyHints.qml	2015-06-19 04:42:29 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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(71)
+
+    Button {
+        objectName: "Button"
+        StyleHints {
+            defaultColor: "blue"
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/StyleHintsElsewhere.qml'
--- tests/unit_x11/tst_subtheming/StyleHintsElsewhere.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/StyleHintsElsewhere.qml	2015-06-19 04:42:29 +0000
@@ -0,0 +1,27 @@
+/*
+ * 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(71)
+
+    StyleHints {
+        anyProperty: true
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/StyleHintsInvalidProperty.qml'
--- tests/unit_x11/tst_subtheming/StyleHintsInvalidProperty.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/StyleHintsInvalidProperty.qml	2015-06-19 04:42:29 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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(71)
+
+    Button {
+        StyleHints {
+            ignoreUnknownProperties: false
+            invalidProperty: 10
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/StyleHintsWithObject.qml'
--- tests/unit_x11/tst_subtheming/StyleHintsWithObject.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/StyleHintsWithObject.qml	2015-06-19 04:42:29 +0000
@@ -0,0 +1,29 @@
+/*
+ * 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(71)
+
+    Button {
+        StyleHints {
+            anyProperty: QtObject{}
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/StyleHintsWithSignal.qml'
--- tests/unit_x11/tst_subtheming/StyleHintsWithSignal.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/StyleHintsWithSignal.qml	2015-06-19 04:42:29 +0000
@@ -0,0 +1,29 @@
+/*
+ * 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(71)
+
+    Button {
+        StyleHints {
+            onDefaultColorChanged: {}
+        }
+    }
+}

=== 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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +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-19 04:42:29 +0000
@@ -21,16 +21,18 @@
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlComponent>
 #include "uctheme.h"
+#include "quickutils.h"
 #include "uctestcase.h"
 #include "ucstyleditembase_p.h"
 #include "ucnamespace.h"
+#include "ucunits.h"
 
 class ThemeTestCase : public UbuntuTestCase
 {
     Q_OBJECT
 public:
-    ThemeTestCase(const QString& file, QWindow* parent = 0)
-        : UbuntuTestCase(file, parent)
+    ThemeTestCase(const QString& file, bool assertOnFailure = true, QWindow* parent = 0)
+        : UbuntuTestCase(file, assertOnFailure, parent)
     {
     }
 
@@ -62,12 +64,6 @@
         QTest::waitForEvents();
     }
 
-    void setStyle(const QString &style)
-    {
-        rootObject()->setProperty("styleDocument", style);
-        QTest::waitForEvents();
-    }
-
     UCTheme *theme()
     {
         return rootObject()->property("theme").value<UCTheme*>();
@@ -134,25 +130,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 +164,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 +204,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 +660,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 +681,162 @@
         // 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");
+    }
+
+    void test_stylehints_errors_data()
+    {
+        QTest::addColumn<QString>("document");
+        QTest::addColumn<int>("row");
+        QTest::addColumn<int>("col");
+        QTest::addColumn<QString>("xfail");
+
+        QTest::newRow("No signals")
+                << "StyleHintsWithSignal.qml" << 26 << 13 << "Signal properties are not supported. \n" \
+"                 onDefaultColorChanged: {} \n" \
+"                 ^";
+        QTest::newRow("No embedded objects")
+                << "StyleHintsWithObject.qml" << 26 << 26 << "StyleHints does not support creating state-specific objects. \n" \
+"                 anyProperty: QtObject{} \n" \
+"                              ^";
+        QTest::newRow("StyleHints declared elsewhere")
+                << "StyleHintsElsewhere.qml" << 24 << 5 << "QML StyleHints: StyleHints must be declared in a StyledItem or a derivate of it.";
+        QTest::newRow("Invalid property")
+                << "StyleHintsInvalidProperty.qml" << 25 << 9 << "QML StyleHints: Style 'ButtonStyle' has no property called 'invalidProperty'.";
+    }
+    void test_stylehints_errors()
+    {
+        QFETCH(QString, document);
+        QFETCH(int, row);
+        QFETCH(int, col);
+        QFETCH(QString, xfail);
+
+        if (!xfail.isEmpty()) {
+            ThemeTestCase::ignoreWarning(document, row, col, xfail);
+        }
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase(document, false));
+    }
+
+    void test_stylehints_simple_property()
+    {
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SimplePropertyHints.qml"));
+        QQuickItem *button = view->findItem<QQuickItem*>("Button");
+        QColor color = button->property("color").value<QColor>();
+        QCOMPARE(color, QColor("blue"));
+    }
+
+    void test_stylehints_bindings()
+    {
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("PropertyBindingHints.qml"));
+        QQuickItem *button = view->findItem<QQuickItem*>("Button");
+        QColor color = button->property("color").value<QColor>();
+        QCOMPARE(color, QColor("blue"));
+        // press the button
+        QPointF pressPt(button->width()/2, button->height()/2);
+        pressPt = view->rootObject()->mapFromItem(button, pressPt);
+        QTest::mousePress(view.data(), Qt::LeftButton, 0, pressPt.toPoint());
+        color = button->property("color").value<QColor>();
+        QCOMPARE(color, QColor("tan"));
+        QTest::mouseRelease(view.data(), Qt::LeftButton, 0, pressPt.toPoint());
+    }
+
+    void test_stylehints_multiple_data()
+    {
+        QTest::addColumn<QString>("document");
+        QTest::addColumn<QString>("colorProperty");
+        QTest::addColumn<QColor>("colorReleased");
+        QTest::addColumn<QColor>("colorPressed");
+        QTest::addColumn<QString>("widthProperty");
+        QTest::addColumn<float>("width");
+
+        QTest::newRow("Same document")
+                << "MoreStyleHints.qml" << "defaultColor" << QColor("brown") << QColor("brown") << "minimumWidth" << UCUnits::instance().gu(20);
+        QTest::newRow("Different document")
+                << "GroupPropertyBindingHints.qml" << "gradientProxy.topColor" << QColor("blue") << QColor("tan") << "minimumWidth" << UCUnits::instance().gu(20);
+    }
+    void test_stylehints_multiple()
+    {
+        QFETCH(QString, document);
+        QFETCH(QString, colorProperty);
+        QFETCH(QColor, colorReleased);
+        QFETCH(QColor, colorPressed);
+        QFETCH(QString, widthProperty);
+        QFETCH(float, width);
+
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase(document));
+        UCStyledItemBase *button = view->findItem<UCStyledItemBase*>("Button");
+        QQuickItem *styleItem = UCStyledItemBasePrivate::get(button)->styleItem;
+        QVERIFY(styleItem);
+        QQmlProperty qmlProperty(styleItem, colorProperty, qmlContext(styleItem));
+        QCOMPARE(qmlProperty.read().value<QColor>(), colorReleased);
+        QCOMPARE(styleItem->property(widthProperty.toUtf8()).toReal(), width);
+
+        QPointF pressPt(button->width()/2, button->height()/2);
+        pressPt = view->rootObject()->mapFromItem(button, pressPt);
+        QTest::mousePress(view.data(), Qt::LeftButton, 0, pressPt.toPoint());
+        QColor pressedColor = qmlProperty.read().value<QColor>();
+        QTest::mouseRelease(view.data(), Qt::LeftButton, 0, pressPt.toPoint());
+        QCOMPARE(pressedColor, colorPressed);
+    }
 };
 
 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-19 04:42:29 +0000
@@ -31,6 +31,18 @@
     StyledItemFallback.qml \
     StyledItemAppThemeFallback.qml \
     DeprecatedTheme.qml \
-    StyledItemAppThemeVersioned.qml
+    StyledItemAppThemeVersioned.qml \
+    StyleOverride.qml \
+    StyleKept.qml \
+    SimplePropertyHints.qml \
+    StyleHintsWithSignal.qml \
+    StyleHintsWithObject.qml \
+    StyleHintsElsewhere.qml \
+    StyleHintsInvalidProperty.qml \
+    PropertyBindingHints.qml \
+    MoreStyleHints.qml \
+    GroupPropertyBindingHints.qml \
+    OverrideStyleHints.qml \
+    HintedButton.qml