Merge 5.6 into 5.6.0

Change-Id: I971229ff050c98258729ad70d9e06b89e5bbf617

15 files changed, 51 insertions, 143 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 16c4cb28ed..791355a668 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -1875,17 +1875,17 @@ QV4::IR::Expr *JSCodeGen::fallbackNameLookup(const QString &name, int line, int
 
 #ifndef V4_BOOTSTRAP
 
-QQmlPropertyData *PropertyResolver::property(const QString &name, bool *notInRevision, QObject *object, QQmlContextData *context)
+QQmlPropertyData *PropertyResolver::property(const QString &name, bool *notInRevision, RevisionCheck check)
 {
     if (notInRevision) *notInRevision = false;
 
-    QQmlPropertyData *d = cache->property(name, object, context);
+    QQmlPropertyData *d = cache->property(name, 0, 0);
 
     // Find the first property
     while (d && d->isFunction())
         d = cache->overrideData(d);
 
-    if (d && !cache->isAllowedInRevision(d)) {
+    if (check != IgnoreRevision && d && !cache->isAllowedInRevision(d)) {
         if (notInRevision) *notInRevision = true;
         return 0;
     } else {
@@ -1894,11 +1894,11 @@ QQmlPropertyData *PropertyResolver::property(const QString &name, bool *notInRev
 }
 
 
-QQmlPropertyData *PropertyResolver::signal(const QString &name, bool *notInRevision, QObject *object, QQmlContextData *context)
+QQmlPropertyData *PropertyResolver::signal(const QString &name, bool *notInRevision)
 {
     if (notInRevision) *notInRevision = false;
 
-    QQmlPropertyData *d = cache->property(name, object, context);
+    QQmlPropertyData *d = cache->property(name, 0, 0);
     if (notInRevision) *notInRevision = false;
 
     while (d && !(d->isFunction()))
@@ -1914,7 +1914,7 @@ QQmlPropertyData *PropertyResolver::signal(const QString &name, bool *notInRevis
     if (name.endsWith(QStringLiteral("Changed"))) {
         QString propName = name.mid(0, name.length() - static_cast<int>(strlen("Changed")));
 
-        d = property(propName, notInRevision, object, context);
+        d = property(propName, notInRevision);
         if (d)
             return cache->signal(d->notifyIndex);
     }
diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index 9a659f4d72..633a4cc2fb 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -460,10 +460,15 @@ struct Q_QML_EXPORT PropertyResolver
         return cache->property(index);
     }
 
-    QQmlPropertyData *property(const QString &name, bool *notInRevision = 0, QObject *object = 0, QQmlContextData *context = 0);
+    enum RevisionCheck {
+        CheckRevision,
+        IgnoreRevision
+    };
+
+    QQmlPropertyData *property(const QString &name, bool *notInRevision = 0, RevisionCheck check = CheckRevision);
 
     // This code must match the semantics of QQmlPropertyPrivate::findSignalByName
-    QQmlPropertyData *signal(const QString &name, bool *notInRevision, QObject *object = 0, QQmlContextData *context = 0);
+    QQmlPropertyData *signal(const QString &name, bool *notInRevision);
 
     QQmlPropertyCache *cache;
 };
diff --git a/src/qml/compiler/qqmltypecompiler.cpp b/src/qml/compiler/qqmltypecompiler.cpp
index cde7a2acb4..6fd15d1eb8 100644
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -1859,6 +1859,7 @@ bool QQmlPropertyValidator::validateObject(int objectIndex, const QV4::CompiledD
         }
 
         bool bindingToDefaultProperty = false;
+        bool isGroupProperty = instantiatingBinding && instantiatingBinding->type == QV4::CompiledData::Binding::Type_GroupProperty;
 
         bool notInRevision = false;
         QQmlPropertyData *pd = 0;
@@ -1867,7 +1868,7 @@ bool QQmlPropertyValidator::validateObject(int objectIndex, const QV4::CompiledD
                 || binding->flags & QV4::CompiledData::Binding::IsSignalHandlerObject)
                 pd = propertyResolver.signal(name, &notInRevision);
             else
-                pd = propertyResolver.property(name, &notInRevision);
+                pd = propertyResolver.property(name, &notInRevision, isGroupProperty ? QmlIR::PropertyResolver::IgnoreRevision : QmlIR::PropertyResolver::CheckRevision);
 
             if (notInRevision) {
                 QString typeName = stringAt(obj->inheritedTypeNameIndex);
@@ -1879,7 +1880,7 @@ bool QQmlPropertyValidator::validateObject(int objectIndex, const QV4::CompiledD
                 }
             }
         } else {
-           if (instantiatingBinding && instantiatingBinding->type == QV4::CompiledData::Binding::Type_GroupProperty)
+           if (isGroupProperty)
                COMPILE_EXCEPTION(binding, tr("Cannot assign a value directly to a grouped property"));
 
            pd = defaultProperty;
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index 1a27a487bd..c5d11ee3c3 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -244,7 +244,7 @@ void QQmlType::SingletonInstanceInfo::destroy(QQmlEngine *e)
     QObject *o = qobjectApis.take(e);
     if (o) {
         QQmlData *ddata = QQmlData::get(o, false);
-        if (ddata && ddata->indestructible)
+        if (url.isEmpty() && ddata && ddata->indestructible && ddata->explicitIndestructibleSet)
             return;
         delete o;
     }
diff --git a/src/qml/qml/qqmlvaluetypewrapper.cpp b/src/qml/qml/qqmlvaluetypewrapper.cpp
index 8ddf91ef3c..5486c14c38 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -357,8 +357,14 @@ ReturnedValue QQmlValueTypeWrapper::get(const Managed *m, String *name, bool *ha
     VALUE_TYPE_LOAD(QMetaType::QString, QString, v4->newString);
     VALUE_TYPE_LOAD(QMetaType::Bool, bool, bool);
 
-    QVariant v(result->propType, (void *)0);
-    void *args[] = { v.data(), 0 };
+    QVariant v;
+    void *args[] = { Q_NULLPTR, Q_NULLPTR };
+    if (result->propType == QMetaType::QVariant) {
+        args[0] = &v;
+    } else {
+        v = QVariant(result->propType, static_cast<void *>(Q_NULLPTR));
+        args[0] = v.data();
+    }
     metaObject->d.static_metacall(reinterpret_cast<QObject*>(gadget), QMetaObject::ReadProperty, index, args);
     return v4->fromVariant(v);
 #undef VALUE_TYPE_ACCESSOR
diff --git a/src/quick/doc/src/concepts/statesanimations/states.qdoc b/src/quick/doc/src/concepts/statesanimations/states.qdoc
index b48a051379..981499ebc5 100644
--- a/src/quick/doc/src/concepts/statesanimations/states.qdoc
+++ b/src/quick/doc/src/concepts/statesanimations/states.qdoc
@@ -74,7 +74,7 @@ configurations with the \c PropertyChanges type.
 \snippet qml/states.qml signal states
 The \l PropertyChanges type will change the values of object properties.
 Objects are referenced through their
-\l{qtqml-syntax-objectattributes.html#the-id-assignment}{id}. Objects outside
+\l{qtqml-syntax-objectattributes.html#the-id-attribute}{id}. Objects outside
 the component are also referenced using the \c id property, exemplified by the
 property change to the external \c flag object.
 
diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h
index 87d489a60a..ffaddefb47 100644
--- a/src/quick/items/qquickanimatedsprite_p.h
+++ b/src/quick/items/qquickanimatedsprite_p.h
@@ -47,7 +47,7 @@
 
 #include <QtQuick/QQuickItem>
 #include <private/qquicksprite_p.h>
-#include <QTime>
+#include <QtCore/qelapsedtimer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -366,7 +366,7 @@ private:
     QQuickAnimatedSpriteMaterial *m_material;
     QQuickSprite* m_sprite;
     QQuickSpriteEngine* m_spriteEngine;
-    QTime m_timestamp;
+    QElapsedTimer m_timestamp;
     int m_curFrame;
     bool m_pleaseReset;
     bool m_running;
diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index e1b33b4660..b8006eedaf 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -264,6 +264,8 @@ void QQuickDropArea::dragEnterEvent(QDragEnterEvent *event)
 
     QQuickDropEvent dragTargetEvent(d, event);
     emit entered(&dragTargetEvent);
+    if (!event->isAccepted())
+        return;
 
     d->containsDrag = true;
     if (QQuickDragMimeData *dragMime = qobject_cast<QQuickDragMimeData *>(const_cast<QMimeData *>(mimeData)))
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index 05bf50574c..deb5582495 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -1978,6 +1978,7 @@ void QQuickPathView::refill()
                     break;
                 }
                 if (d->items.contains(item)) {
+                    d->releaseItem(item);
                     break; //Otherwise we'd "re-add" it, and get confused
                 }
                 if (d->currentIndex == idx) {
@@ -2008,6 +2009,7 @@ void QQuickPathView::refill()
                     break;
                 }
                 if (d->items.contains(item)) {
+                    d->releaseItem(item);
                     break; //Otherwise we'd "re-add" it, and get confused
                 }
                 if (d->currentIndex == idx) {
@@ -2049,6 +2051,8 @@ void QQuickPathView::refill()
                         int lastListIdx = d->items.indexOf(lastItem);
                         d->items.insert(lastListIdx + 1, item);
                         d->updateItem(item, nextPos);
+                    } else {
+                        d->releaseItem(item);
                     }
 
                     lastItem = item;
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 5c436d2074..3aec464958 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -224,7 +224,7 @@ void QQuickTextPrivate::setBottomPadding(qreal value, bool reset)
     The default is true.
 */
 
-void QQuickText::q_imagesLoaded()
+void QQuickText::q_updateLayout()
 {
     Q_D(QQuickText);
     d->updateLayout();
@@ -1170,7 +1170,7 @@ void QQuickTextPrivate::ensureDoc()
         extra->doc->setDocumentMargin(0);
         extra->doc->setBaseUrl(q->baseUrl());
         qmlobject_connect(extra->doc, QQuickTextDocumentWithImageResources, SIGNAL(imagesLoaded()),
-                          q, QQuickText, SLOT(q_imagesLoaded()));
+                          q, QQuickText, SLOT(q_updateLayout()));
     }
 }
 
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index 5b385aeb0a..ea69aea3f9 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -292,7 +292,7 @@ protected:
     void invalidateFontCaches();
 
 private Q_SLOTS:
-    void q_imagesLoaded();
+    void q_updateLayout();
     void triggerPreprocess();
     void imageDownloadFinished();
 
diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp
index d40dedd798..2c7ab254f8 100644
--- a/src/quick/items/qquicktextnode.cpp
+++ b/src/quick/items/qquicktextnode.cpp
@@ -84,50 +84,6 @@ QQuickTextNode::~QQuickTextNode()
     qDeleteAll(m_textures);
 }
 
-#if 0
-void QQuickTextNode::setColor(const QColor &color)
-{
-    if (m_usePixmapCache) {
-        setUpdateFlag(UpdateNodes);
-    } else {
-        for (QSGNode *childNode = firstChild(); childNode; childNode = childNode->nextSibling()) {
-            if (childNode->subType() == GlyphNodeSubType) {
-                QSGGlyphNode *glyphNode = static_cast<QSGGlyphNode *>(childNode);
-                if (glyphNode->color() == m_color)
-                    glyphNode->setColor(color);
-            } else if (childNode->subType() == SolidRectNodeSubType) {
-                QSGSimpleRectNode *solidRectNode = static_cast<QSGSimpleRectNode *>(childNode);
-                if (solidRectNode->color() == m_color)
-                    solidRectNode->setColor(color);
-            }
-        }
-    }
-    m_color = color;
-}
-
-void QQuickTextNode::setStyleColor(const QColor &styleColor)
-{
-    if (m_textStyle != QQuickTextNode::NormalTextStyle) {
-        if (m_usePixmapCache) {
-            setUpdateFlag(UpdateNodes);
-        } else {
-            for (QSGNode *childNode = firstChild(); childNode; childNode = childNode->nextSibling()) {
-                if (childNode->subType() == GlyphNodeSubType) {
-                    QSGGlyphNode *glyphNode = static_cast<QSGGlyphNode *>(childNode);
-                    if (glyphNode->color() == m_styleColor)
-                        glyphNode->setColor(styleColor);
-                } else if (childNode->subType() == SolidRectNodeSubType) {
-                    QSGSimpleRectNode *solidRectNode = static_cast<QSGSimpleRectNode *>(childNode);
-                    if (solidRectNode->color() == m_styleColor)
-                        solidRectNode->setColor(styleColor);
-                }
-            }
-        }
-    }
-    m_styleColor = styleColor;
-}
-#endif
-
 QSGGlyphNode *QQuickTextNode::addGlyphs(const QPointF &position, const QGlyphRun &glyphs, const QColor &color,
                                      QQuickText::TextStyle style, const QColor &styleColor,
                                      QSGNode *parentNode)
@@ -312,78 +268,4 @@ void QQuickTextNode::deleteContent()
     m_textures.clear();
 }
 
-#if 0
-void QQuickTextNode::updateNodes()
-{
-    return;
-    deleteContent();
-    if (m_text.isEmpty())
-        return;
-
-    if (m_usePixmapCache) {
-        // ### gunnar: port properly
-//        QPixmap pixmap = generatedPixmap();
-//        if (pixmap.isNull())
-//            return;
-
-//        QSGImageNode *pixmapNode = m_context->createImageNode();
-//        pixmapNode->setRect(pixmap.rect());
-//        pixmapNode->setSourceRect(pixmap.rect());
-//        pixmapNode->setOpacity(m_opacity);
-//        pixmapNode->setClampToEdge(true);
-//        pixmapNode->setLinearFiltering(m_linearFiltering);
-
-//        appendChildNode(pixmapNode);
-    } else {
-        if (m_text.isEmpty())
-            return;
-
-        // Implement styling by drawing text several times at slight shifts. shiftForStyle
-        // contains the sequence of shifted positions at which to draw the text. All except
-        // the last will be drawn with styleColor.
-        QList<QPointF> shiftForStyle;
-        switch (m_textStyle) {
-        case OutlineTextStyle:
-            // ### Should be made faster by implementing outline material
-            shiftForStyle << QPointF(-1, 0);
-            shiftForStyle << QPointF(0, -1);
-            shiftForStyle << QPointF(1, 0);
-            shiftForStyle << QPointF(0, 1);
-            break;
-        case SunkenTextStyle:
-            shiftForStyle << QPointF(0, -1);
-            break;
-        case RaisedTextStyle:
-            shiftForStyle << QPointF(0, 1);
-            break;
-        default:
-            break;
-        }
-
-        shiftForStyle << QPointF(0, 0); // Regular position
-        while (!shiftForStyle.isEmpty()) {
-            QPointF shift = shiftForStyle.takeFirst();
-
-            // Use styleColor for all but last shift
-            if (m_richText) {
-                QColor overrideColor = shiftForStyle.isEmpty() ? QColor() : m_styleColor;
-
-                QTextFrame *textFrame = m_textDocument->rootFrame();
-                QPointF p = m_textDocument->documentLayout()->frameBoundingRect(textFrame).topLeft();
-
-                QTextFrame::iterator it = textFrame->begin();
-                while (!it.atEnd()) {
-                    addTextBlock(shift + p, it.currentBlock(), overrideColor);
-                    ++it;
-                }
-            } else {
-                addTextLayout(shift, m_textLayout, shiftForStyle.isEmpty()
-                                                   ? m_color
-                                                   : m_styleColor);
-            }
-        }
-    }
-}
-#endif
-
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 53527dcbd1..b93aa06336 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -285,6 +285,13 @@ void QQuickWindow::update()
         QQuickRenderControlPrivate::get(d->renderControl)->update();
 }
 
+void QQuickWindow::handleScreenChanged(QScreen *screen)
+{
+    Q_D(QQuickWindow);
+    Q_UNUSED(screen)
+    d->forcePolish();
+}
+
 void forcePolishHelper(QQuickItem *item)
 {
     if (item->flags() & QQuickItem::ItemHasContents) {
@@ -299,12 +306,12 @@ void forcePolishHelper(QQuickItem *item)
 /*!
     Schedules polish events on all items in the scene.
 */
-void QQuickWindow::forcePolish()
+void QQuickWindowPrivate::forcePolish()
 {
-    Q_D(QQuickWindow);
-    if (!screen())
+    Q_Q(QQuickWindow);
+    if (!q->screen())
         return;
-    forcePolishHelper(d->contentItem);
+    forcePolishHelper(contentItem);
 }
 
 void forceUpdate(QQuickItem *item)
@@ -473,7 +480,7 @@ void QQuickWindowPrivate::init(QQuickWindow *c, QQuickRenderControl *control)
     QObject::connect(context, SIGNAL(invalidated()), q, SLOT(cleanupSceneGraph()), Qt::DirectConnection);
 
     QObject::connect(q, SIGNAL(focusObjectChanged(QObject*)), q, SIGNAL(activeFocusItemChanged()));
-    QObject::connect(q, SIGNAL(screenChanged(QScreen*)), q, SLOT(forcePolish()));
+    QObject::connect(q, SIGNAL(screenChanged(QScreen*)), q, SLOT(handleScreenChanged(QScreen*)));
 
     QObject::connect(q, SIGNAL(frameSwapped()), q, SLOT(runJobsAfterSwap()), Qt::DirectConnection);
 }
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index d5bf9fba81..9f8ad095cd 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -196,7 +196,7 @@ protected:
 private Q_SLOTS:
     void maybeUpdate();
     void cleanupSceneGraph();
-    void forcePolish();
+    void handleScreenChanged(QScreen *screen);
     void setTransientParent_helper(QQuickWindow *window);
     void runJobsAfterSwap();
 
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index e475c48b0a..623707140e 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -190,6 +190,7 @@ public:
     void cleanup(QSGNode *);
 
     void polishItems();
+    void forcePolish();
     void syncSceneGraph();
     void renderSceneGraph(const QSize &size);