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

[Zsombor Egri]

Fix property binding restore on theme palette values.

Fix property binding restore on theme palette values.

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1209/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6408/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1425/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6409/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1175/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6410/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1175/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1418/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6411/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/766/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1418
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1418/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1425
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1209
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1175
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6412/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6411
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6409
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6408
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6410

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

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

Niiiiice. Thanks for sorting this out!

review: Approve

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

FAILED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1426/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6445/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1183/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6446/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1183/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1217/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6447/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1433/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6448/console

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/518/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1426/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1433
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1217
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1183
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/810/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6445
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6448
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6447
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6446

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1429/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6456/console

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

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Sorry armhf failure because of arale but now the yakkety should be fixed first.

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1220/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6465/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1186/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6466/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1186/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1436/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6467/console

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

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/521/
Executed test runs:
    ABORTED: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1429/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1436
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1220
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1186
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/813/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6456
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6467
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6465
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6466

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Yakkety tests now fixed ("fixed") with another MP, retopapproving.

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1230/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6508/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1446/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6509/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1196/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6510/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1196/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-yakkety/10/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6511/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:2106
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1439/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/6512/console

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

review: Approve (continuous-integration)

=== modified file 'src/UbuntuToolkit/uctheme.cpp'
--- src/UbuntuToolkit/uctheme.cpp	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/uctheme.cpp	2016-09-16 17:10:32 +0000
@@ -150,16 +150,19 @@
 const QString THEME_FOLDER_FORMAT("%1/%2/");
 const QString PARENT_THEME_FILE("parent_theme");
 
-static inline void updateBinding (QQmlAbstractBinding *binding)
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+static inline void updateBinding(const QQmlAbstractBinding::Ptr &binding)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
     if (binding->isValueTypeProxy())
         return;
-    static_cast<QQmlBinding *>(binding)->update();
+    static_cast<QQmlBinding*>(binding.data())->update();
+}
 #else
-    binding->update();
+static inline void updateBinding (const QQmlAbstractBinding *binding)
+{
+    const_cast<QQmlAbstractBinding*>(binding)->update();
+}
 #endif
-}
 
 QStringList themeSearchPath()
 {
@@ -263,11 +266,14 @@
         // restore the config binding to the config target
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
         if (config.configBinding && !config.configBinding->isValueTypeProxy()) {
+            QQmlBinding *qmlBinding = static_cast<QQmlBinding*>(config.configBinding.data());
+            qmlBinding->removeFromObject();
+            QQmlPropertyPrivate::removeBinding(config.paletteProperty);
 #else
         if (config.configBinding && config.configBinding->bindingType() == QQmlAbstractBinding::Binding) {
-#endif
             QQmlBinding *qmlBinding = static_cast<QQmlBinding*>(config.configBinding);
             qmlBinding->removeFromObject();
+#endif
             qmlBinding->setTarget(config.configProperty);
         }
 
@@ -275,7 +281,7 @@
             // restore the binding to the palette
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
             QQmlAbstractBinding::Ptr prev(QQmlPropertyPrivate::binding(config.paletteProperty));
-            QQmlPropertyPrivate::setBinding(config.paletteProperty, config.paletteBinding);
+            QQmlPropertyPrivate::setBinding(config.paletteProperty, config.paletteBinding.data());
 #else
             QQmlAbstractBinding *prev = QQmlPropertyPrivate::setBinding(config.paletteProperty, config.paletteBinding);
 #endif
@@ -293,7 +299,7 @@
         }
 
         config.paletteProperty = QQmlProperty();
-        config.paletteBinding = NULL;
+        config.paletteBinding = Q_NULLPTR;
         config.paletteValue.clear();
     }
 
@@ -346,6 +352,10 @@
         config.paletteBinding = QQmlPropertyPrivate::binding(config.paletteProperty);
         if (!config.paletteBinding) {
             config.paletteValue = config.paletteProperty.read();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+        } else {
+            QQmlPropertyPrivate::removeBinding(config.paletteProperty);
+#endif
         }
 
         // apply configuration
@@ -353,17 +363,26 @@
             // transfer binding's target
 #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
             if (!config.configBinding->isValueTypeProxy()) {
+                QQmlBinding *qmlBinding = static_cast<QQmlBinding*>(config.configBinding.data());
 #else
             if (config.configBinding->bindingType() == QQmlAbstractBinding::Binding) {
-#endif
                 QQmlBinding *qmlBinding = static_cast<QQmlBinding*>(config.configBinding);
+#endif
                 qmlBinding->setTarget(config.paletteProperty);
             }
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            QQmlPropertyPrivate::setBinding(config.paletteProperty, config.configBinding.data());
+#else
             QQmlPropertyPrivate::setBinding(config.paletteProperty, config.configBinding);
+#endif
         } else {
             if (config.paletteBinding) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+                QQmlPropertyPrivate::removeBinding(config.paletteProperty);
+#else
                 // remove binding so the property doesn't clear it
                 QQmlPropertyPrivate::setBinding(config.paletteProperty, 0);
+#endif
             }
             config.paletteProperty.write(config.configProperty.read());
         }

=== modified file 'src/UbuntuToolkit/uctheme_p.h'
--- src/UbuntuToolkit/uctheme_p.h	2016-09-09 17:49:07 +0000
+++ src/UbuntuToolkit/uctheme_p.h	2016-09-16 17:10:32 +0000
@@ -27,12 +27,17 @@
 #include <QtQml/QQmlComponent>
 #include <QtQml/QQmlParserStatus>
 #include <QtQml/QQmlProperty>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#include <QtQml/private/qqmlabstractbinding_p.h>
+#endif
 #include <QtQml/private/qpodvector_p.h>
 
 #include <UbuntuToolkit/ubuntutoolkitglobal.h>
 #include <UbuntuToolkit/private/ucdefaulttheme_p.h>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
 class QQmlAbstractBinding;
+#endif
 class QQuickItem;
 
 UT_NAMESPACE_BEGIN
@@ -148,8 +153,13 @@
             QQmlProperty configProperty;
             QQmlProperty paletteProperty;
             QVariant paletteValue;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            QQmlAbstractBinding::Ptr configBinding;
+            QQmlAbstractBinding::Ptr paletteBinding;
+#else
             QQmlAbstractBinding *configBinding;
             QQmlAbstractBinding *paletteBinding;
+#endif
         };
 
         // configuration palette, not the original theme one

=== modified file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	2016-09-16 11:13:32 +0000
+++ tests/unit/unit.pro	2016-09-16 17:10:32 +0000
@@ -29,7 +29,7 @@
     mousefilters \
     animator \
     serviceproperties \
-#    subtheming \ # FIXME: Breaks with Qt 5.6. See bug #1570478.
+    subtheming \
     swipearea \
     touchregistry \
     bottomedge \
@@ -38,7 +38,7 @@
     units \
     scaling_image_provider \
     qquick_image_extension \
-#    performance \ # FIXME: Breaks with Qt 5.6. See bug #1570478.
+    performance \
     mainview \
     i18n \
     arguments \