Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: Icfa1d61fcc286c3418d4a625de11d2191336fa60

18 files changed, 98 insertions, 75 deletions

diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index f5df5763bb..c32e9546a5 100644
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -316,8 +316,6 @@ struct AnimatedSpriteVertices {
 //TODO: Implicitly size element to size of sprite
 QQuickAnimatedSprite::QQuickAnimatedSprite(QQuickItem *parent) :
     QQuickItem(parent)
-    , m_node(0)
-    , m_material(0)
     , m_sprite(new QQuickSprite(this))
     , m_spriteEngine(0)
     , m_curFrame(0)
@@ -331,9 +329,9 @@ QQuickAnimatedSprite::QQuickAnimatedSprite(QQuickItem *parent) :
 {
     setFlag(ItemHasContents);
     connect(this, SIGNAL(widthChanged()),
-            this, SLOT(sizeVertices()));
+            this, SLOT(reset()));
     connect(this, SIGNAL(heightChanged()),
-            this, SLOT(sizeVertices()));
+            this, SLOT(reset()));
 }
 
 bool QQuickAnimatedSprite::isCurrentFrameChangedConnected()
@@ -461,12 +459,9 @@ static QSGGeometry::AttributeSet AnimatedSprite_AttributeSet =
     AnimatedSprite_Attributes
 };
 
-void QQuickAnimatedSprite::sizeVertices()
+void QQuickAnimatedSprite::sizeVertices(QSGGeometryNode *node)
 {
-    if (!m_node)
-        return;
-
-    AnimatedSpriteVertices *p = (AnimatedSpriteVertices *) m_node->geometry()->vertexData();
+    AnimatedSpriteVertices *p = (AnimatedSpriteVertices *) node->geometry()->vertexData();
     p->v1.x = 0;
     p->v1.y = 0;
 
@@ -494,21 +489,21 @@ QSGGeometryNode* QQuickAnimatedSprite::buildNode()
         return 0;
     }
 
-    m_material = new QQuickAnimatedSpriteMaterial();
+    QQuickAnimatedSpriteMaterial *material = new QQuickAnimatedSpriteMaterial();
 
     QImage image = m_spriteEngine->assembledImage(); //Engine prints errors if there are any
     if (image.isNull())
         return 0;
     m_sheetSize = QSizeF(image.size());
-    m_material->texture = window()->createTextureFromImage(image);
+    material->texture = window()->createTextureFromImage(image);
     m_spriteEngine->start(0);
-    m_material->animT = 0;
-    m_material->animX1 = m_spriteEngine->spriteX() / m_sheetSize.width();
-    m_material->animY1 = m_spriteEngine->spriteY() / m_sheetSize.height();
-    m_material->animX2 = m_material->animX1;
-    m_material->animY2 = m_material->animY1;
-    m_material->animW = m_spriteEngine->spriteWidth() / m_sheetSize.width();
-    m_material->animH = m_spriteEngine->spriteHeight() / m_sheetSize.height();
+    material->animT = 0;
+    material->animX1 = m_spriteEngine->spriteX() / m_sheetSize.width();
+    material->animY1 = m_spriteEngine->spriteY() / m_sheetSize.height();
+    material->animX2 = material->animX1;
+    material->animY2 = material->animY1;
+    material->animW = m_spriteEngine->spriteWidth() / m_sheetSize.width();
+    material->animH = m_spriteEngine->spriteHeight() / m_sheetSize.height();
 
     int vCount = 4;
     int iCount = 6;
@@ -517,7 +512,7 @@ QSGGeometryNode* QQuickAnimatedSprite::buildNode()
 
     AnimatedSpriteVertices *p = (AnimatedSpriteVertices *) g->vertexData();
 
-    QRectF texRect = m_material->texture->normalizedTextureSubRect();
+    QRectF texRect = material->texture->normalizedTextureSubRect();
 
     p->v1.tx = texRect.topLeft().x();
     p->v1.ty = texRect.topLeft().y();
@@ -540,51 +535,51 @@ QSGGeometryNode* QQuickAnimatedSprite::buildNode()
     indices[5] = 2;
 
 
-    m_node = new QSGGeometryNode();
-    m_node->setGeometry(g);
-    m_node->setMaterial(m_material);
-    m_node->setFlag(QSGGeometryNode::OwnsMaterial);
-    m_node->setFlag(QSGGeometryNode::OwnsGeometry);
-    sizeVertices();
-    return m_node;
+    QSGGeometryNode *node = new QSGGeometryNode();
+    node->setGeometry(g);
+    node->setMaterial(material);
+    node->setFlag(QSGGeometryNode::OwnsMaterial);
+    node->setFlag(QSGGeometryNode::OwnsGeometry);
+    sizeVertices(node);
+    return node;
 }
 
 void QQuickAnimatedSprite::reset()
 {
     m_pleaseReset = true;
+    update();
 }
 
-QSGNode *QQuickAnimatedSprite::updatePaintNode(QSGNode *, UpdatePaintNodeData *)
+QSGNode *QQuickAnimatedSprite::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
 {
     if (m_pleaseReset) {
-        delete m_node;
+        delete oldNode;
 
-        m_node = 0;
-        m_material = 0;
+        oldNode = 0;
         m_pleaseReset = false;
     }
 
-    prepareNextFrame();
+    QSGGeometryNode *node = static_cast<QSGGeometryNode *>(oldNode);
+    if (!node)
+        node = buildNode();
+
+    if (node)
+        prepareNextFrame(node);
 
     if (m_running) {
         if (!m_paused)
             update();
 
-        if (m_node) {
-            m_node->markDirty(QSGNode::DirtyMaterial);
+        if (node) {
+            node->markDirty(QSGNode::DirtyMaterial);
         }
     }
 
-    return m_node;
+    return node;
 }
 
-void QQuickAnimatedSprite::prepareNextFrame()
+void QQuickAnimatedSprite::prepareNextFrame(QSGGeometryNode *node)
 {
-    if (m_node == 0)
-        m_node = buildNode();
-    if (m_node == 0) //error creating node
-        return;
-
     int timeInt = m_timestamp.elapsed() + m_pauseOffset;
     qreal time =  timeInt / 1000.;
 
@@ -700,14 +695,15 @@ void QQuickAnimatedSprite::prepareNextFrame()
         }
     }
 
-    m_material->animX1 = x1;
-    m_material->animY1 = y1;
-    m_material->animX2 = x2;
-    m_material->animY2 = y2;
-    m_material->animW = w;
-    m_material->animH = h;
-    m_material->animT = m_interpolate ? progress : 0.0;
-    m_material->texture->setFiltering(smooth() ? QSGTexture::Linear : QSGTexture::Nearest);
+    QQuickAnimatedSpriteMaterial *material = static_cast<QQuickAnimatedSpriteMaterial *>(node->material());
+    material->animX1 = x1;
+    material->animY1 = y1;
+    material->animX2 = x2;
+    material->animY2 = y2;
+    material->animW = w;
+    material->animH = h;
+    material->animT = m_interpolate ? progress : 0.0;
+    material->texture->setFiltering(smooth() ? QSGTexture::Linear : QSGTexture::Nearest);
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h
index 6b49d903df..1e5981c1a4 100644
--- a/src/quick/items/qquickanimatedsprite_p.h
+++ b/src/quick/items/qquickanimatedsprite_p.h
@@ -357,19 +357,19 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void createEngine();
-    void sizeVertices();
+    void sizeVertices(QSGGeometryNode *node);
 
-protected:
+protected Q_SLOTS:
     void reset();
+
+protected:
     void componentComplete() Q_DECL_OVERRIDE;
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
 private:
     bool isCurrentFrameChangedConnected();
-    void prepareNextFrame();
+    void prepareNextFrame(QSGGeometryNode *node);
     void reloadImage();
     QSGGeometryNode* buildNode();
-    QSGGeometryNode *m_node;
-    QQuickAnimatedSpriteMaterial *m_material;
     QQuickSprite* m_sprite;
     QQuickSpriteEngine* m_spriteEngine;
     QElapsedTimer m_timestamp;
diff --git a/src/quick/items/qquickframebufferobject.h b/src/quick/items/qquickframebufferobject.h
index 446cfed22b..13eeb931ad 100644
--- a/src/quick/items/qquickframebufferobject.h
+++ b/src/quick/items/qquickframebufferobject.h
@@ -75,7 +75,7 @@ public:
         void *data;
     };
 
-    QQuickFramebufferObject(QQuickItem *parent = 0);
+    QQuickFramebufferObject(QQuickItem *parent = Q_NULLPTR);
 
     bool textureFollowsItemSize() const;
     void setTextureFollowsItemSize(bool follows);
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index b33f3d8b6a..c5c17615ee 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -59,7 +59,7 @@ class Q_QUICK_EXPORT QQuickTransform : public QObject
 {
     Q_OBJECT
 public:
-    QQuickTransform(QObject *parent = 0);
+    explicit QQuickTransform(QObject *parent = Q_NULLPTR);
     ~QQuickTransform();
 
     void appendToItem(QQuickItem *);
@@ -195,7 +195,7 @@ public:
     };
     Q_ENUM(TransformOrigin)
 
-    QQuickItem(QQuickItem *parent = 0);
+    explicit QQuickItem(QQuickItem *parent = Q_NULLPTR);
     virtual ~QQuickItem();
 
     QQuickWindow *window() const;
@@ -440,7 +440,7 @@ protected:
     virtual void updatePolish();
 
 protected:
-    QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent = 0);
+    QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent = Q_NULLPTR);
 
 private:
     Q_PRIVATE_SLOT(d_func(), void _q_resourceObjectDeleted(QObject *))
diff --git a/src/quick/items/qquickitemgrabresult.h b/src/quick/items/qquickitemgrabresult.h
index 15399010dd..42d71862de 100644
--- a/src/quick/items/qquickitemgrabresult.h
+++ b/src/quick/items/qquickitemgrabresult.h
@@ -79,7 +79,7 @@ private Q_SLOTS:
 private:
     friend class QQuickItem;
 
-    QQuickItemGrabResult(QObject *parent = 0);
+    QQuickItemGrabResult(QObject *parent = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h
index 1e384a45e3..f9e3c91a42 100644
--- a/src/quick/items/qquickpainteditem.h
+++ b/src/quick/items/qquickpainteditem.h
@@ -57,7 +57,7 @@ class Q_QUICK_EXPORT QQuickPaintedItem : public QQuickItem
     Q_PROPERTY(QSize textureSize READ textureSize WRITE setTextureSize NOTIFY textureSizeChanged)
 
 public:
-    QQuickPaintedItem(QQuickItem *parent = 0);
+    explicit QQuickPaintedItem(QQuickItem *parent = Q_NULLPTR);
     virtual ~QQuickPaintedItem();
 
     enum RenderTarget {
@@ -118,7 +118,7 @@ Q_SIGNALS:
     void textureSizeChanged();
 
 protected:
-    QQuickPaintedItem(QQuickPaintedItemPrivate &dd, QQuickItem *parent = 0);
+    QQuickPaintedItem(QQuickPaintedItemPrivate &dd, QQuickItem *parent = Q_NULLPTR);
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
     void releaseResources() Q_DECL_OVERRIDE;
 
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index 285a394cee..e36df53d38 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -54,6 +54,8 @@
 #include <QtQuick/private/qquickwindow_p.h>
 #include <QtCore/private/qobject_p.h>
 
+#include <private/qquickshadereffectnode_p.h>
+
 QT_BEGIN_NAMESPACE
 
 extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_format, bool include_alpha);
@@ -181,6 +183,8 @@ void QQuickRenderControlPrivate::windowDestroyed()
         delete QQuickWindowPrivate::get(window)->animationController;
         QQuickWindowPrivate::get(window)->animationController = 0;
 
+        QQuickShaderEffectMaterial::cleanupMaterialCache();
+
         window = 0;
     }
 }
diff --git a/src/quick/items/qquickrendercontrol.h b/src/quick/items/qquickrendercontrol.h
index c5691b1329..31ea176cc1 100644
--- a/src/quick/items/qquickrendercontrol.h
+++ b/src/quick/items/qquickrendercontrol.h
@@ -55,7 +55,7 @@ class Q_QUICK_EXPORT QQuickRenderControl : public QObject
     Q_OBJECT
 
 public:
-    QQuickRenderControl(QObject *parent = 0);
+    explicit QQuickRenderControl(QObject *parent = Q_NULLPTR);
     ~QQuickRenderControl();
 
     void prepareThread(QThread *targetThread);
@@ -68,8 +68,8 @@ public:
 
     QImage grab();
 
-    static QWindow *renderWindowFor(QQuickWindow *win, QPoint *offset = 0);
-    virtual QWindow *renderWindow(QPoint *offset) { Q_UNUSED(offset); return 0; }
+    static QWindow *renderWindowFor(QQuickWindow *win, QPoint *offset = Q_NULLPTR);
+    virtual QWindow *renderWindow(QPoint *offset) { Q_UNUSED(offset); return Q_NULLPTR; }
 
 Q_SIGNALS:
     void renderRequested();
diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h
index 8064a31377..a424002dfb 100644
--- a/src/quick/items/qquickscalegrid_p_p.h
+++ b/src/quick/items/qquickscalegrid_p_p.h
@@ -61,7 +61,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickScaleGrid : public QObject
+class Q_AUTOTEST_EXPORT QQuickScaleGrid : public QObject
 {
     Q_OBJECT
 
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp
index 05900bc12b..0cfb85db97 100644
--- a/src/quick/items/qquickshadereffect.cpp
+++ b/src/quick/items/qquickshadereffect.cpp
@@ -958,6 +958,12 @@ void QQuickShaderEffect::updateGeometry()
     update();
 }
 
+void QQuickShaderEffect::updateGeometryIfAtlased()
+{
+    if (m_supportsAtlasTextures)
+        updateGeometry();
+}
+
 void QQuickShaderEffect::updateLogAndStatus(const QString &log, int status)
 {
     m_log = parseLog() + log;
@@ -1006,6 +1012,8 @@ QSGNode *QQuickShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa
         m_dirtyUniforms = true;
         m_dirtyGeometry = true;
         connect(node, SIGNAL(logAndStatusChanged(QString,int)), this, SLOT(updateLogAndStatus(QString,int)));
+        connect(node, &QQuickShaderEffectNode::dirtyTexture,
+                this, &QQuickShaderEffect::updateGeometryIfAtlased);
     }
 
     QQuickShaderEffectMaterial *material = static_cast<QQuickShaderEffectMaterial *>(node->material());
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h
index 23557e52fa..fb266d4c44 100644
--- a/src/quick/items/qquickshadereffect_p.h
+++ b/src/quick/items/qquickshadereffect_p.h
@@ -173,6 +173,7 @@ protected:
 
 private Q_SLOTS:
     void updateGeometry();
+    void updateGeometryIfAtlased();
     void updateLogAndStatus(const QString &log, int status);
     void sourceDestroyed(QObject *object);
     void propertyChanged(int mappedId);
diff --git a/src/quick/items/qquickshadereffectnode.cpp b/src/quick/items/qquickshadereffectnode.cpp
index 8040bbe754..66154fac6d 100644
--- a/src/quick/items/qquickshadereffectnode.cpp
+++ b/src/quick/items/qquickshadereffectnode.cpp
@@ -497,6 +497,7 @@ QQuickShaderEffectNode::~QQuickShaderEffectNode()
 void QQuickShaderEffectNode::markDirtyTexture()
 {
     markDirty(DirtyMaterial);
+    Q_EMIT dirtyTexture();
 }
 
 void QQuickShaderEffectNode::textureProviderDestroyed(QObject *object)
diff --git a/src/quick/items/qquickshadereffectnode_p.h b/src/quick/items/qquickshadereffectnode_p.h
index 570a0c3213..cc016d13a7 100644
--- a/src/quick/items/qquickshadereffectnode_p.h
+++ b/src/quick/items/qquickshadereffectnode_p.h
@@ -148,6 +148,7 @@ public:
 
 Q_SIGNALS:
     void logAndStatusChanged(const QString &, int status);
+    void dirtyTexture();
 
 private Q_SLOTS:
     void markDirtyTexture();
diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp
index 6429c0d668..63d3180842 100644
--- a/src/quick/items/qquicksprite.cpp
+++ b/src/quick/items/qquicksprite.cpp
@@ -224,6 +224,11 @@ QQuickSprite::QQuickSprite(QObject *parent)
 {
 }
 
+/*! \internal */
+QQuickSprite::~QQuickSprite()
+{
+}
+
 int QQuickSprite::variedDuration() const //Deals with precedence when multiple durations are set
 {
     if (m_frameSync)
diff --git a/src/quick/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h
index 3a91b3374a..1b8c8cee84 100644
--- a/src/quick/items/qquicksprite_p.h
+++ b/src/quick/items/qquicksprite_p.h
@@ -61,7 +61,8 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickSprite : public QQuickStochasticState
+// exported, since it's used in QtQuickParticles
+class Q_QUICK_EXPORT QQuickSprite : public QQuickStochasticState
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
@@ -84,6 +85,7 @@ class QQuickSprite : public QQuickStochasticState
 
 public:
     explicit QQuickSprite(QObject *parent = 0);
+    ~QQuickSprite();
 
     QUrl source() const
     {
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 4b816c41c3..2b1141bea8 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1893,11 +1893,15 @@ bool QQuickTextInput::isRightToLeft(int start, int end)
     \qmlmethod QtQuick::TextInput::cut()
 
     Moves the currently selected text to the system clipboard.
+
+    \note If the echo mode is set to a mode other than Normal then cut
+    will not work.  This is to prevent using cut as a method of bypassing
+    password features of the line control.
 */
 void QQuickTextInput::cut()
 {
     Q_D(QQuickTextInput);
-    if (!d->m_readOnly) {
+    if (!d->m_readOnly && d->m_echoMode == QQuickTextInput::Normal) {
         d->copy();
         d->del();
     }
@@ -1907,6 +1911,10 @@ void QQuickTextInput::cut()
     \qmlmethod QtQuick::TextInput::copy()
 
     Copies the currently selected text to the system clipboard.
+
+    \note If the echo mode is set to a mode other than Normal then copy
+    will not work.  This is to prevent using copy as a method of bypassing
+    password features of the line control.
 */
 void QQuickTextInput::copy()
 {
@@ -4286,10 +4294,7 @@ void QQuickTextInputPrivate::processKeyEvent(QKeyEvent* event)
         }
     }
     else if (event == QKeySequence::Cut) {
-        if (!m_readOnly) {
-            copy();
-            del();
-        }
+        q->cut();
     }
     else if (event == QKeySequence::DeleteEndOfLine) {
         if (!m_readOnly)
diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h
index 29ce5b4935..1fcc34e3a1 100644
--- a/src/quick/items/qquickview.h
+++ b/src/quick/items/qquickview.h
@@ -60,9 +60,9 @@ class Q_QUICK_EXPORT QQuickView : public QQuickWindow
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
 public:
-    explicit QQuickView(QWindow *parent = 0);
+    explicit QQuickView(QWindow *parent = Q_NULLPTR);
     QQuickView(QQmlEngine* engine, QWindow *parent);
-    QQuickView(const QUrl &source, QWindow *parent = 0);
+    explicit QQuickView(const QUrl &source, QWindow *parent = Q_NULLPTR);
     virtual ~QQuickView();
 
     QUrl source() const;
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index e04a4a1ce2..1024147bb4 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -95,7 +95,7 @@ public:
     };
     Q_ENUM(SceneGraphError)
 
-    QQuickWindow(QWindow *parent = 0);
+    explicit QQuickWindow(QWindow *parent = Q_NULLPTR);
     explicit QQuickWindow(QQuickRenderControl *renderControl);
 
     virtual ~QQuickWindow();
@@ -129,7 +129,7 @@ public:
     // Scene graph specific functions
     QSGTexture *createTextureFromImage(const QImage &image) const;
     QSGTexture *createTextureFromImage(const QImage &image, CreateTextureOptions options) const;
-    QSGTexture *createTextureFromId(uint id, const QSize &size, CreateTextureOptions options = CreateTextureOption(0)) const;
+    QSGTexture *createTextureFromId(uint id, const QSize &size, CreateTextureOptions options = CreateTextureOption()) const;
 
     void setClearBeforeRendering(bool enabled);
     bool clearBeforeRendering() const;
@@ -176,7 +176,7 @@ public Q_SLOTS:
     void releaseResources();
 
 protected:
-    QQuickWindow(QQuickWindowPrivate &dd, QWindow *parent = 0);
+    QQuickWindow(QQuickWindowPrivate &dd, QWindow *parent = Q_NULLPTR);
 
     void exposeEvent(QExposeEvent *) Q_DECL_OVERRIDE;
     void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE;