10 files changed, 46 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 4a21acb050..d8779e0d12 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -449,6 +449,12 @@ The following functions are also on the Qt object.
         \li \c "windows" - Windows
         \li \c "winrt" - WinRT / UWP
     \endlist
+
+    \row
+    \li \c platform.pluginName
+    \li This is the name of the platform set on the QGuiApplication instance
+        as returned by \l QGuiApplication::platformName()
+
     \endtable
 */
 
diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp
index 7939656107..6418812bae 100644
--- a/src/qml/qml/qqmlglobal.cpp
+++ b/src/qml/qml/qqmlglobal.cpp
@@ -343,6 +343,8 @@ QObject *QQmlGuiProvider::styleHints()
     return o;
 }
 
+QString QQmlGuiProvider::pluginName() const { return QString(); }
+
 static QQmlGuiProvider *guiProvider = 0;
 
 Q_QML_PRIVATE_EXPORT QQmlGuiProvider *QQml_setGuiProvider(QQmlGuiProvider *newProvider)
diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h
index 707814e781..a6c113f5a7 100644
--- a/src/qml/qml/qqmlglobal_p.h
+++ b/src/qml/qml/qqmlglobal_p.h
@@ -311,6 +311,7 @@ public:
     virtual QObject *styleHints();
     virtual QStringList fontFamilies();
     virtual bool openUrlExternally(QUrl &);
+    virtual QString pluginName() const;
 };
 
 Q_QML_PRIVATE_EXPORT QQmlGuiProvider *QQml_setGuiProvider(QQmlGuiProvider *);
diff --git a/src/qml/qml/qqmlplatform.cpp b/src/qml/qml/qqmlplatform.cpp
index 165cde5eb3..a8c402af2e 100644
--- a/src/qml/qml/qqmlplatform.cpp
+++ b/src/qml/qml/qqmlplatform.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qqmlplatform_p.h"
+#include "qqmlglobal_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -78,6 +79,11 @@ QString QQmlPlatform::os()
 #endif
 }
 
+QString QQmlPlatform::pluginName() const
+{
+    return QQml_guiProvider()->pluginName();
+}
+
 QT_END_NAMESPACE
 
 #include "moc_qqmlplatform_p.cpp"
diff --git a/src/qml/qml/qqmlplatform_p.h b/src/qml/qml/qqmlplatform_p.h
index 6887720adb..6246ca7105 100644
--- a/src/qml/qml/qqmlplatform_p.h
+++ b/src/qml/qml/qqmlplatform_p.h
@@ -61,12 +61,14 @@ class Q_QML_PRIVATE_EXPORT QQmlPlatform : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString os READ os CONSTANT)
+    Q_PROPERTY(QString pluginName READ pluginName CONSTANT)
 
 public:
     explicit QQmlPlatform(QObject *parent = 0);
     virtual ~QQmlPlatform();
 
     static QString os();
+    QString pluginName() const;
 
 private:
     Q_DISABLE_COPY(QQmlPlatform)
diff --git a/src/quick/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h
index 143fe8904d..54da093259 100644
--- a/src/quick/items/qquickanimatedimage_p.h
+++ b/src/quick/items/qquickanimatedimage_p.h
@@ -97,7 +97,6 @@ Q_SIGNALS:
     void playingChanged();
     void pausedChanged();
     void frameChanged();
-    void sourceSizeChanged();
 
 private Q_SLOTS:
     void movieUpdate();
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp
index 0c532bcd4c..65284eb532 100644
--- a/src/quick/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@ -1,6 +1,5 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 Crimson AS <info@crimson.no>
 ** Copyright (C) 2016 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
@@ -270,9 +269,11 @@ QGradientStops QQuickGradient::gradientStops() const
 
 void QQuickGradient::doUpdate()
 {
-    static_cast<QQuickItem*>(parent())->update();
+    emit updated();
 }
 
+int QQuickRectanglePrivate::doUpdateSlotIdx = -1;
+
 /*!
     \qmltype Rectangle
     \instantiates QQuickRectangle
@@ -326,6 +327,11 @@ QQuickRectangle::QQuickRectangle(QQuickItem *parent)
     setFlag(ItemHasContents);
 }
 
+void QQuickRectangle::doUpdate()
+{
+    update();
+}
+
 /*!
     \qmlproperty bool QtQuick::Rectangle::antialiasing
 
@@ -390,7 +396,16 @@ void QQuickRectangle::setGradient(QQuickGradient *gradient)
     Q_D(QQuickRectangle);
     if (d->gradient == gradient)
         return;
+    static int updatedSignalIdx = -1;
+    if (updatedSignalIdx < 0)
+        updatedSignalIdx = QMetaMethod::fromSignal(&QQuickGradient::updated).methodIndex();
+    if (d->doUpdateSlotIdx < 0)
+        d->doUpdateSlotIdx = QQuickRectangle::staticMetaObject.indexOfSlot("doUpdate()");
+    if (d->gradient)
+        QMetaObject::disconnect(d->gradient, updatedSignalIdx, this, d->doUpdateSlotIdx);
     d->gradient = gradient;
+    if (d->gradient)
+        QMetaObject::connect(d->gradient, updatedSignalIdx, this, d->doUpdateSlotIdx);
     update();
 }
 
diff --git a/src/quick/items/qquickrectangle_p.h b/src/quick/items/qquickrectangle_p.h
index 627f778e44..724a06013c 100644
--- a/src/quick/items/qquickrectangle_p.h
+++ b/src/quick/items/qquickrectangle_p.h
@@ -129,6 +129,9 @@ public:
 
     QGradientStops gradientStops() const;
 
+Q_SIGNALS:
+    void updated();
+
 private:
     void doUpdate();
 
@@ -169,6 +172,9 @@ Q_SIGNALS:
 protected:
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
 
+private Q_SLOTS:
+    void doUpdate();
+
 private:
     Q_DISABLE_COPY(QQuickRectangle)
     Q_DECLARE_PRIVATE(QQuickRectangle)
diff --git a/src/quick/items/qquickrectangle_p_p.h b/src/quick/items/qquickrectangle_p_p.h
index e771beec87..3c1aaf7661 100644
--- a/src/quick/items/qquickrectangle_p_p.h
+++ b/src/quick/items/qquickrectangle_p_p.h
@@ -76,6 +76,7 @@ public:
     QQuickGradient *gradient;
     QQuickPen *pen;
     qreal radius;
+    static int doUpdateSlotIdx;
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index 2070fd7ff0..1d2f3de1df 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -814,6 +814,11 @@ public:
         return false;
 #endif
     }
+
+    QString pluginName() const override
+    {
+        return QGuiApplication::platformName();
+    }
 };