Merge lp:~zeller-benjamin/ubuntu-ui-toolkit/qt56 into lp:ubuntu-ui-toolkit/staging

[Benjamin Zeller]

Compile with Qt 5.6

Compile with Qt 5.6

[lp:~zeller-benjamin/ubuntu-ui-toolkit/qt56]

1899. By Benjamin Zeller on 2016-03-16

Fix typos

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

FAILED: Continuous integration, rev:1899
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/515/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1857/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1899
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/295/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1858/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1899
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/269/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1859/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:1899
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/166/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/515/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/526/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/295/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/269/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1862/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1857
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1861
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1858
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1859

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

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Looks sensible on the apicheck side, could've been done cleaner but not all that crucial either.

review: Approve (apicheck)

[lp:~zeller-benjamin/ubuntu-ui-toolkit/qt56]

1900. By Benjamin Zeller on 2016-03-16

Fix error in propertychange_p.cpp

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:1900
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/169/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/519
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/530
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/530/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/299
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/273
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1881/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1872
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1877
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1874
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1880

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

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

All look cool, PropertyChange does the job (see tests pass :))
Next move is to move this to the UbuntuToolkit lib :)

review: Approve

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

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

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

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

review: Approve (continuous-integration)

=== modified file 'apicheck/apicheck.cpp'
--- apicheck/apicheck.cpp	2015-12-18 15:26:04 +0000
+++ apicheck/apicheck.cpp	2016-03-16 21:41:32 +0000
@@ -50,6 +50,7 @@
 
 QString currentProperty;
 QString inObjectInstantiation;
+QQmlEngine *currentEngine=0;
 
 void collectReachableMetaObjects(const QMetaObject *meta, QSet<const QMetaObject *> *metas, bool extended = false)
 {
@@ -91,8 +92,13 @@
 void collectReachableMetaObjects(const QQmlType *ty, QSet<const QMetaObject *> *metas)
 {
     collectReachableMetaObjects(ty->metaObject(), metas, ty->isExtendedType());
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+    if (ty->attachedPropertiesType(currentEngine))
+        collectReachableMetaObjects(ty->attachedPropertiesType(currentEngine), metas);
+#else
     if (ty->attachedPropertiesType())
         collectReachableMetaObjects(ty->attachedPropertiesType(), metas);
+#endif
 }
 
 /* We want to add the MetaObject for 'Qt' to the list, this is a
@@ -536,7 +542,11 @@
             if (isSingleton)
                 object.insert("isSingleton", true);
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType(attachedPropertiesType)) {
+#else
             if (const QMetaObject *attachedType = (*qmlTypes.begin())->attachedPropertiesType()) {
+#endif
                 // Can happen when a type is registered that returns itself as attachedPropertiesType()
                 // because there is no creatable type to attach to.
                 if (attachedType != meta) {
@@ -794,6 +804,7 @@
     qmlRegisterSingletonType<QObject>("Qt.test.qtestroot", 1, 0, "QTestRootObject", testRootObject);
 
     QQmlEngine engine;
+    currentEngine = &engine;
     QObject::connect(&engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
 
     // load the QtQuick 2 plugin

=== modified file 'src/Ubuntu/Components/plugin/propertychange_p.cpp'
--- src/Ubuntu/Components/plugin/propertychange_p.cpp	2015-06-07 13:20:11 +0000
+++ src/Ubuntu/Components/plugin/propertychange_p.cpp	2016-03-16 21:41:32 +0000
@@ -42,7 +42,12 @@
 void PropertyChange::backup()
 {
     if (!backedUp) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+        backupBinding = QQmlPropertyPrivate::binding(qmlProperty);
+        QQmlPropertyPrivate::setBinding(qmlProperty, Q_NULLPTR);
+#else
         backupBinding = QQmlPropertyPrivate::setBinding(qmlProperty, Q_NULLPTR);
+#endif
         backupValue = qmlProperty.read();
         backedUp = true;
     }
@@ -70,9 +75,18 @@
        return;
    }
    change->backup();
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+   QQmlAbstractBinding::Ptr prev(QQmlPropertyPrivate::binding(change->qmlProperty));
+   QQmlPropertyPrivate::setBinding(change->qmlProperty, binding);
+#else
    QQmlAbstractBinding *prev = QQmlPropertyPrivate::setBinding(change->qmlProperty, binding);
+#endif
    if (prev && prev != binding && prev != change->backupBinding) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+       prev->removeFromObject();
+#else
        prev->destroy();
+#endif
    }
 }
 
@@ -88,9 +102,18 @@
     if (change->backedUp) {
         if (change->qmlProperty.isValid()) {
             if (change->backupBinding) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+                QQmlAbstractBinding::Ptr prev(QQmlPropertyPrivate::binding(change->qmlProperty));
+                QQmlPropertyPrivate::setBinding(change->qmlProperty, change->backupBinding.data());
+#else
                 QQmlAbstractBinding *prev = QQmlPropertyPrivate::setBinding(change->qmlProperty, change->backupBinding);
+#endif
                 if (prev != change->backupBinding && prev) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+                    prev->removeFromObject();
+#else
                     prev->destroy();
+#endif
                 }
             } else {
                 change->qmlProperty.write(change->backupValue);

=== modified file 'src/Ubuntu/Components/plugin/propertychange_p.h'
--- src/Ubuntu/Components/plugin/propertychange_p.h	2015-05-29 06:09:56 +0000
+++ src/Ubuntu/Components/plugin/propertychange_p.h	2016-03-16 21:41:32 +0000
@@ -21,6 +21,10 @@
 #include <QtCore/QObject>
 #include <QtQml/QQmlProperty>
 
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+#include <QtCore/QExplicitlySharedDataPointer>
+#endif
+
 class QQmlAbstractBinding;
 class PropertyChange
 {
@@ -41,7 +45,12 @@
     bool backedUp;
     QQmlProperty qmlProperty;
     QVariant backupValue;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+    QExplicitlySharedDataPointer<QQmlAbstractBinding> backupBinding;
+#else
     QQmlAbstractBinding *backupBinding;
+#endif
 
     void backup();
 };

=== modified file 'src/Ubuntu/Components/plugin/ucbottomedge.cpp'
--- src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-03-14 16:45:38 +0000
+++ src/Ubuntu/Components/plugin/ucbottomedge.cpp	2016-03-16 21:41:32 +0000
@@ -439,7 +439,6 @@
 bool UCBottomEdgePrivate::loadStyleItem(bool animated)
 {
     // fix styleVersion
-    Q_Q(UCBottomEdge);
     if (!styleVersion) {
         styleVersion = BUILD_VERSION(1, 3);
     }

=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2016-02-25 19:42:11 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2016-03-16 21:41:32 +0000
@@ -1471,7 +1471,6 @@
 
 void UCListItem::focusInEvent(QFocusEvent *event)
 {
-    Q_D(UCListItem);
     UCStyledItemBase::focusInEvent(event);
     if (event->reason() == Qt::MouseFocusReason) {
         d_func()->setListViewKeyNavigation(false);

=== modified file 'src/Ubuntu/Components/plugin/ucstylehints.cpp'
--- src/Ubuntu/Components/plugin/ucstylehints.cpp	2015-07-13 15:00:25 +0000
+++ src/Ubuntu/Components/plugin/ucstylehints.cpp	2016-03-16 21:41:32 +0000
@@ -252,7 +252,11 @@
         QQmlBinding *newBinding = 0;
         if (e.id != QQmlBinding::Invalid) {
             QV4::Scope scope(QQmlEnginePrivate::getV4Engine(qmlEngine(this)));
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            QV4::ScopedValue function(scope, QV4::FunctionObject::createQmlFunction(cdata, item, m_cdata->compilationUnit->runtimeFunctions[e.id]));
+#else
             QV4::ScopedValue function(scope, QV4::QmlBindingWrapper::createQmlCallableForFunction(cdata, item, m_cdata->compilationUnit->runtimeFunctions[e.id]));
+#endif
             newBinding = new QQmlBinding(function, item, cdata);
         }
         if (!newBinding) {

=== modified file 'src/Ubuntu/Components/plugin/uctheme.cpp'
--- src/Ubuntu/Components/plugin/uctheme.cpp	2016-03-15 10:36:32 +0000
+++ src/Ubuntu/Components/plugin/uctheme.cpp	2016-03-16 21:41:32 +0000
@@ -148,6 +148,17 @@
 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)
+    if (binding->isValueTypeProxy())
+        return;
+    static_cast<QQmlBinding *>(binding)->update();
+#else
+    binding->update();
+#endif
+}
+
 QStringList themeSearchPath()
 {
     QString envPath = QLatin1String(getenv("UBUNTU_UI_TOOLKIT_THEMES_PATH"));
@@ -248,7 +259,11 @@
         }
 
         // restore the config binding to the config target
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+        if (config.configBinding && !config.configBinding->isValueTypeProxy()) {
+#else
         if (config.configBinding && config.configBinding->bindingType() == QQmlAbstractBinding::Binding) {
+#endif
             QQmlBinding *qmlBinding = static_cast<QQmlBinding*>(config.configBinding);
             qmlBinding->removeFromObject();
             qmlBinding->setTarget(config.configProperty);
@@ -256,11 +271,21 @@
 
         if (config.paletteBinding) {
             // 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);
+#else
             QQmlAbstractBinding *prev = QQmlPropertyPrivate::setBinding(config.paletteProperty, config.paletteBinding);
+#endif
             if (prev && prev != config.paletteBinding && prev != config.configBinding) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+                prev->removeFromObject();
+                prev.reset();
+#else
                 prev->destroy();
+#endif
             }
-            config.paletteBinding->update();
+            updateBinding(config.paletteBinding);
         } else {
             config.paletteProperty.write(config.paletteValue);
         }
@@ -324,7 +349,11 @@
         // apply configuration
         if (config.configBinding) {
             // transfer binding's target
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            if (!config.configBinding->isValueTypeProxy()) {
+#else
             if (config.configBinding->bindingType() == QQmlAbstractBinding::Binding) {
+#endif
                 QQmlBinding *qmlBinding = static_cast<QQmlBinding*>(config.configBinding);
                 qmlBinding->setTarget(config.paletteProperty);
             }

=== modified file 'src/Ubuntu/Layouts/plugin/propertychanges.cpp'
--- src/Ubuntu/Layouts/plugin/propertychanges.cpp	2014-05-16 08:33:43 +0000
+++ src/Ubuntu/Layouts/plugin/propertychanges.cpp	2016-03-16 21:41:32 +0000
@@ -90,7 +90,11 @@
  */
 void PropertyAction::setTargetBinding(QQmlAbstractBinding *binding, bool deletable)
 {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+    toBinding = binding;
+#else
     toBinding = QQmlAbstractBinding::getPointer(binding);
+#endif
     deleteToBinding = deletable;
 }
 
@@ -101,13 +105,26 @@
  */
 void PropertyAction::apply()
 {
-    if (!toBinding.isNull()) {
+    if (toBinding) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+        QQmlAbstractBinding::Ptr binding(QQmlPropertyPrivate::binding(property));
+        QQmlPropertyPrivate::setBinding(property, toBinding.data());
+#else
         QQmlAbstractBinding *binding = QQmlPropertyPrivate::setBinding(property, toBinding.data());
+#endif
         if (binding != fromBinding || (binding == fromBinding && deleteFromBinding)) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            if (binding == fromBinding) {
+                fromBinding.reset();
+                fromBinding=0;
+            }
+            binding->removeFromObject();
+#else
             binding->destroy();
             if (binding == fromBinding) {
                 fromBinding = 0;
             }
+#endif
         }
     } else if (toValueSet) {
         if (!property.object()->setProperty(property.name().toLocal8Bit(), toValue)) {
@@ -127,8 +144,13 @@
     if (fromBinding) {
         QQmlPropertyPrivate::setBinding(property, 0);
         if (deleteFromBinding) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            fromBinding->removeFromObject();
+            fromBinding.reset();
+#else
             fromBinding->destroy();
             fromBinding = 0;
+#endif
             deleteFromBinding = false;
         }
     }
@@ -144,15 +166,31 @@
         property.reset();
     }
     if (fromBinding) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+        QQmlAbstractBinding::Ptr revertedBinding(QQmlPropertyPrivate::binding(property));
+        QQmlPropertyPrivate::setBinding(property, fromBinding.data());
+#else
         QQmlAbstractBinding *revertedBinding = QQmlPropertyPrivate::setBinding(property, fromBinding);
+#endif
+
         if (revertedBinding && (revertedBinding != fromBinding) && ((revertedBinding != toBinding.data()) || (revertedBinding == toBinding.data() && deleteToBinding))) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            revertedBinding->removeFromObject();
+            revertedBinding.reset();
+#else
             revertedBinding->destroy();
+#endif
         }
-    } else if (!toBinding.isNull() && QQmlPropertyPrivate::binding(property) == toBinding.data()) {
+    } else if (toBinding && QQmlPropertyPrivate::binding(property) == toBinding.data()) {
         QQmlPropertyPrivate::setBinding(property, 0);
         if (deleteToBinding) {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            toBinding->removeFromObject();
+            toBinding.reset();
+#else
             toBinding.data()->destroy();
             toBinding.clear();
+#endif
             deleteToBinding = false;
         }
     } else if (property.isValid() && fromValue.isValid() && (type == Value)) {
@@ -193,7 +231,11 @@
         } else {
             QQmlBinding *binding = new QQmlBinding(script, target, scriptContext);
             binding->setTarget(action.property);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+            action.toBinding = binding;
+#else
             action.toBinding = QQmlAbstractBinding::getPointer(binding);
+#endif
             action.deleteToBinding = true;
         }
     }

=== modified file 'src/Ubuntu/Layouts/plugin/propertychanges_p.h'
--- src/Ubuntu/Layouts/plugin/propertychanges_p.h	2014-05-13 15:02:13 +0000
+++ src/Ubuntu/Layouts/plugin/propertychanges_p.h	2016-03-16 21:41:32 +0000
@@ -46,8 +46,15 @@
     // members
     Type type;
     QQmlProperty property;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+    QQmlAbstractBinding::Ptr fromBinding;
+    QQmlAbstractBinding::Ptr toBinding;
+#else
     QQmlAbstractBinding *fromBinding;
     QWeakPointer<QQmlAbstractBinding> toBinding;
+#endif
+
     QVariant fromValue;
     QVariant toValue;
 

=== modified file 'src/Ubuntu/UbuntuToolkit/asyncloader.cpp'
--- src/Ubuntu/UbuntuToolkit/asyncloader.cpp	2016-02-25 14:30:46 +0000
+++ src/Ubuntu/UbuntuToolkit/asyncloader.cpp	2016-03-16 21:41:32 +0000
@@ -88,7 +88,6 @@
         return;
     }
 
-    Q_Q(AsyncLoader);
     if (componentHandler) {
         QObject::disconnect(*componentHandler);
     }

=== modified file 'tests/unit_x11/tst_touchregistry/tst_TouchRegistry.cpp'
--- tests/unit_x11/tst_touchregistry/tst_TouchRegistry.cpp	2015-11-09 15:46:45 +0000
+++ tests/unit_x11/tst_touchregistry/tst_TouchRegistry.cpp	2016-03-16 21:41:32 +0000
@@ -707,7 +707,7 @@
     touchRegistry->removeCandidateOwnerForTouch(0, &earlyCandidate);
 
     QCOMPARE(lateCandidate.ownedTouches.count(), 1);
-    QCOMPARE(lateCandidate.ownedTouches.contains(0), 1);
+    QCOMPARE(lateCandidate.ownedTouches.contains(0), true);
 
     // Check that there's no trace left of touch 0 as we no longer need to keep tabs on it.
     QVERIFY(!touchRegistry->findTouchInfo(0));