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

Change-Id: Iec1b2de53c275996364c4bab0123ccb3e6e9895e

22 files changed, 100 insertions, 153 deletions

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index e6c64c520a..9fcfe53b05 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -1882,17 +1882,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 {
@@ -1901,11 +1901,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()))
@@ -1921,7 +1921,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 3a92659dda..057ed1be9f 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -466,10 +466,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 f5bfe3c896..2b3cd93052 100644
--- a/src/qml/compiler/qqmltypecompiler.cpp
+++ b/src/qml/compiler/qqmltypecompiler.cpp
@@ -1865,6 +1865,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;
@@ -1873,7 +1874,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);
@@ -1885,7 +1886,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/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index 606ba07adf..29f83da522 100644
--- a/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@ -189,6 +189,8 @@ QV4::ReturnedValue QV4Include::method_include(QV4::CallContext *ctx)
         V4THROW_ERROR("Qt.include(): Can only be called from JavaScript files");
 
     QUrl url(scope.engine->resolvedUrl(ctx->args()[0].toQStringNoThrow()));
+    if (scope.engine->qmlEngine() && scope.engine->qmlEngine()->urlInterceptor())
+        url = scope.engine->qmlEngine()->urlInterceptor()->intercept(url, QQmlAbstractUrlInterceptor::JavaScriptFile);
 
     QV4::ScopedValue callbackFunction(scope, QV4::Primitive::undefinedValue());
     if (ctx->argc() >= 2 && ctx->args()[1].as<QV4::FunctionObject>())
diff --git a/src/qml/jsruntime/qv4persistent.cpp b/src/qml/jsruntime/qv4persistent.cpp
index 2a7a9a6ee7..f6d4046ec4 100644
--- a/src/qml/jsruntime/qv4persistent.cpp
+++ b/src/qml/jsruntime/qv4persistent.cpp
@@ -40,6 +40,7 @@
 #include "qv4persistent_p.h"
 #include <private/qv4mm_p.h>
 #include "qv4object_p.h"
+#include "qv4qobjectwrapper_p.h"
 #include "PageAllocation.h"
 
 using namespace QV4;
@@ -387,7 +388,7 @@ WeakValue &WeakValue::operator=(const WeakValue &other)
 
 WeakValue::~WeakValue()
 {
-    PersistentValueStorage::free(val);
+    free();
 }
 
 void WeakValue::set(ExecutionEngine *engine, const Value &value)
@@ -418,3 +419,21 @@ void WeakValue::markOnce(ExecutionEngine *e)
     val->mark(e);
 }
 
+void WeakValue::free()
+{
+    if (!val)
+        return;
+
+    ExecutionEngine *e = engine();
+    if (e && val->as<QObjectWrapper>()) {
+        // Some QV4::QObjectWrapper Value will be freed in WeakValue::~WeakValue() before MemoryManager::sweep() is being called,
+        // in this case we will never have a chance to call detroyObject() on those QV4::QObjectWrapper objects.
+        // Here we don't free these Value immediately, instead we keep track of them to free them later in MemoryManager::sweep()
+        e->memoryManager->m_pendingFreedObjectWrapperValue.push_back(val);
+    } else {
+        PersistentValueStorage::free(val);
+    }
+
+    val = 0;
+}
+
diff --git a/src/qml/jsruntime/qv4persistent_p.h b/src/qml/jsruntime/qv4persistent_p.h
index b8f179c9eb..5b1926468a 100644
--- a/src/qml/jsruntime/qv4persistent_p.h
+++ b/src/qml/jsruntime/qv4persistent_p.h
@@ -184,15 +184,15 @@ public:
 
     bool isUndefined() const { return !val || val->isUndefined(); }
     bool isNullOrUndefined() const { return !val || val->isNullOrUndefined(); }
-    void clear() {
-        PersistentValueStorage::free(val);
-        val = 0;
-    }
+    void clear() { free(); }
 
     void markOnce(ExecutionEngine *e);
 
 private:
     Value *val;
+
+private:
+    void free();
 };
 
 } // namespace QV4
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp
index 18676ec8e6..fe94a11082 100644
--- a/src/qml/memory/qv4mm.cpp
+++ b/src/qml/memory/qv4mm.cpp
@@ -47,8 +47,6 @@
 #include "StdLibExtras.h"
 
 #include <QTime>
-#include <QVector>
-#include <QVector>
 #include <QMap>
 
 #include <iostream>
@@ -443,6 +441,21 @@ void MemoryManager::sweep(bool lastSweep)
         (*it) = Primitive::undefinedValue();
     }
 
+    // Now it is time to free QV4::QObjectWrapper Value, we must check the Value's tag to make sure its object has been destroyed
+    const int pendingCount = m_pendingFreedObjectWrapperValue.count();
+    if (pendingCount) {
+        QVector<Value *> remainingWeakQObjectWrappers;
+        remainingWeakQObjectWrappers.reserve(pendingCount);
+        for (int i = 0; i < pendingCount; ++i) {
+            Value *v = m_pendingFreedObjectWrapperValue.at(i);
+            if (v->tag() == Value::Undefined_Type)
+                PersistentValueStorage::free(v);
+            else
+                remainingWeakQObjectWrappers.append(v);
+        }
+        m_pendingFreedObjectWrapperValue = remainingWeakQObjectWrappers;
+    }
+
     if (MultiplyWrappedQObjectMap *multiplyWrappedQObjects = engine->m_multiplyWrappedQObjects) {
         for (MultiplyWrappedQObjectMap::Iterator it = multiplyWrappedQObjects->begin(); it != multiplyWrappedQObjects->end();) {
             if (!it.value().isNullOrUndefined())
diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h
index b1503ad963..e169675f7d 100644
--- a/src/qml/memory/qv4mm_p.h
+++ b/src/qml/memory/qv4mm_p.h
@@ -55,6 +55,7 @@
 #include <private/qv4value_p.h>
 #include <private/qv4scopedvalue_p.h>
 #include <private/qv4object_p.h>
+#include <QVector>
 
 //#define DETAILED_MM_STATS
 
@@ -333,6 +334,7 @@ public:
     QScopedPointer<Data> m_d;
     PersistentValueStorage *m_persistentValues;
     PersistentValueStorage *m_weakValues;
+    QVector<Value *> m_pendingFreedObjectWrapperValue;
 };
 
 }
diff --git a/src/qml/qml/qqmlmetatype.cpp b/src/qml/qml/qqmlmetatype.cpp
index a5173e9efb..576478b729 100644
--- a/src/qml/qml/qqmlmetatype.cpp
+++ b/src/qml/qml/qqmlmetatype.cpp
@@ -250,7 +250,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 486feca7cb..d313557e98 100644
--- a/src/qml/qml/qqmlvaluetypewrapper.cpp
+++ b/src/qml/qml/qqmlvaluetypewrapper.cpp
@@ -363,8 +363,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/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index b2507fb99e..91eef2d982 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -2276,6 +2276,9 @@ QQmlV4Handle QQmlListModel::get(int index) const
         } else {
             QObject *object = m_listModel->getOrCreateModelObject(const_cast<QQmlListModel *>(this), index);
             result = scope.engine->memoryManager->allocObject<QV4::ModelObject>(object, const_cast<QQmlListModel *>(this), index);
+            // Keep track of the QObjectWrapper in persistent value storage
+            QV4::Value *val = scope.engine->memoryManager->m_weakValues->allocate();
+            *val = result;
         }
     }
 
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 b2633619d5..6b49d903df 100644
--- a/src/quick/items/qquickanimatedsprite_p.h
+++ b/src/quick/items/qquickanimatedsprite_p.h
@@ -53,7 +53,7 @@
 
 #include <QtQuick/QQuickItem>
 #include <private/qquicksprite_p.h>
-#include <QTime>
+#include <QtCore/qelapsedtimer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -372,7 +372,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 aecdcdbc28..1701441240 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -270,6 +270,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/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index dec2351de8..5be1c86fb4 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -4257,7 +4257,7 @@ void QQuickItem::setBaselineOffset(qreal offset)
  * The call to QQuickItem::updatePaintNode() will always happen if the
  * item is showing in a QQuickWindow.
  *
- * Only items which specifies QQuickItem::ItemHasContents are allowed
+ * Only items which specify QQuickItem::ItemHasContents are allowed
  * to call QQuickItem::update().
  */
 void QQuickItem::update()
@@ -4297,7 +4297,7 @@ void QQuickItem::polish()
     \qmlmethod object QtQuick::Item::mapFromItem(Item item, real x, real y, real width, real height)
 
     Maps the point (\a x, \a y) or rect (\a x, \a y, \a width, \a height), which is in \a
-    item's coordinate system, to this item's coordinate system, and returns a \l point or \rect
+    item's coordinate system, to this item's coordinate system, and returns a \l point or \l rect
     matching the mapped coordinate.
 
     If \a item is a \c null value, this maps the point or rect from the coordinate system of
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index e140d61dee..f0bbb1e732 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -1984,6 +1984,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) {
@@ -2014,6 +2015,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) {
@@ -2055,6 +2057,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 97e00362be..0f7f1961a1 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -234,7 +234,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();
@@ -1180,7 +1180,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 87cde29199..0b35ad5f91 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -298,7 +298,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 d05f51d1ac..7ee01b5398 100644
--- a/src/quick/items/qquicktextnode.cpp
+++ b/src/quick/items/qquicktextnode.cpp
@@ -90,50 +90,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)
@@ -318,78 +274,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 f2cfeb56aa..635f1da77e 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -294,6 +294,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) {
@@ -308,12 +315,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)
@@ -484,7 +491,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);
 
@@ -4012,7 +4019,7 @@ void QQuickWindow::resetOpenGLState()
 */
 
 /*!
-    \qmlproperty Window::active
+    \qmlproperty bool Window::active
     \since 5.1
 
     The active status of the window.
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index c101ac5239..262828ad1d 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -202,7 +202,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 54cdcf8da1..652320c1c9 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -196,6 +196,7 @@ public:
     void cleanup(QSGNode *);
 
     void polishItems();
+    void forcePolish();
     void syncSceneGraph();
     void renderSceneGraph(const QSize &size);