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

[Zsombor Egri]

Introducing StyleHints to provide style specific property changes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1531
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1832/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3044/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/560/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/562/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/559/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3042/console

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

review: Needs Fixing (continuous-integration)

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

1532. By Zsombor Egri on 2015-06-02

documentation fixed

1533. By Zsombor Egri on 2015-06-02

accidental scrollbar style change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1533
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1837/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3051
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/567
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2588
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3049
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3049/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20898

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

I wish all merge requests were this clean, every time I thought "hmm is there a test for that code" there was. Looks pretty slick, and tests pass now.

review: Approve

=== modified file 'components.api'
--- components.api	2015-05-26 07:38:55 +0000
+++ components.api	2015-06-02 15:25:00 +0000
@@ -871,6 +871,8 @@
     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)
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2015-05-21 10:50:35 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-06-02 15:25:00 +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"
@@ -211,6 +212,7 @@
     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-02 15:25:00 +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-02 15:25:00 +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::binding(qmlProperty);
         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-02 15:25:00 +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/ucstyleditembase.cpp'
--- modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-05-26 15:05:46 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-06-02 15:25:00 +0000
@@ -19,6 +19,7 @@
 #include "ucstyleditembase.h"
 #include "ucstyleditembase_p.h"
 #include "uctheme.h"
+#include "ucstylehints.h"
 #include <QtQml/QQmlEngine>
 #include <QtQuick/private/qquickanchors_p.h>
 
 
=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase.h'
--- modules/Ubuntu/Components/plugin/ucstyleditembase.h	2015-05-22 13:54:38 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase.h	2015-06-02 15:25:00 +0000
@@ -23,6 +23,7 @@
 
 class UCStyledItemBasePrivate;
 class UCTheme;
+class UCStyleHints;
 class UCStyledItemBase : public QQuickItem
 {
     Q_OBJECT
 
=== 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-02 15:25:00 +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-02 15:25:00 +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/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-02 15:25:00 +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-02 15:25:00 +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>
 
=== 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-02 15:25:00 +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-02 15:25:00 +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-02 15:25:00 +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-02 15:25:00 +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-02 15:25:00 +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"
+        }
+    }
+}
 
=== 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-02 15:25:00 +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-02 15:25:00 +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-02 15:25:00 +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-02 15:25:00 +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-02 15:25:00 +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: {}
+        }
+    }
+}
 
=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-05-26 15:05:46 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-06-02 15:25:00 +0000
@@ -25,13 +25,14 @@
 #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)
     {
     }
 
@@ -741,6 +742,101 @@
         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-22 13:54:38 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-06-02 15:25:00 +0000
@@ -33,6 +33,16 @@
     DeprecatedTheme.qml \
     StyledItemAppThemeVersioned.qml \
     StyleOverride.qml \
-    StyleKept.qml
+    StyleKept.qml \
+    SimplePropertyHints.qml \
+    StyleHintsWithSignal.qml \
+    StyleHintsWithObject.qml \
+    StyleHintsElsewhere.qml \
+    StyleHintsInvalidProperty.qml \
+    PropertyBindingHints.qml \
+    MoreStyleHints.qml \
+    GroupPropertyBindingHints.qml \
+    OverrideStyleHints.qml \
+    HintedButton.qml