Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandler

We no longer have any hope of getting this into 5.8. Change-Id: I2decfa47e589ba7ae2d6b951c6517a2c311d0192
author: Shawn Rutledge <shawn.rutledge@qt.io> 2016-11-17 16:24:33 +0100
committer: Shawn Rutledge <shawn.rutledge@qt.io> 2016-11-17 16:24:33 +0100
commit: 0beb79fb0e9ed814b3e9447ccd97a0c099af9e4b (patch)
tree: 28f7411dc50f099ef0812c830525b4f50ed7ecf4 /src/quick/items
parent: 12a3eff085bc7eb30a5283e32009d2899b464278 (diff)
parent: a7fd83cd0cecb789006baecabfc6a49c49b7f48c (diff)
96 files changed, 1054 insertions, 548 deletions
diff --git a/src/quick/items/context2d/qquickcanvascontext_p.h b/src/quick/items/context2d/qquickcanvascontext_p.h
index 4f71770e1a..0746b7dcd3 100644
--- a/src/quick/items/context2d/qquickcanvascontext_p.h
+++ b/src/quick/items/context2d/qquickcanvascontext_p.h
@@ -51,10 +51,13 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_canvas);
+
 #include <QtQuick/qquickitem.h>
 #include <private/qv8engine_p.h>
 
-
 QT_BEGIN_NAMESPACE
 
 class QQuickCanvasItem;
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 3b2b125c63..dcad719ef0 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -1095,6 +1095,27 @@ QImage QQuickCanvasItem::toImage(const QRectF& rect) const
     return QImage();
 }
 
+static const char* mimeToType(const QString &mime)
+{
+    const QLatin1String imagePrefix("image/");
+    if (!mime.startsWith(imagePrefix))
+        return nullptr;
+    const QStringRef mimeExt = mime.midRef(imagePrefix.size());
+    if (mimeExt == QLatin1String("png"))
+        return "png";
+    else if (mimeExt == QLatin1String("bmp"))
+        return "bmp";
+    else if (mimeExt == QLatin1String("jpeg"))
+        return "jpeg";
+    else if (mimeExt == QLatin1String("x-portable-pixmap"))
+        return "ppm";
+    else if (mimeExt == QLatin1String("tiff"))
+        return "tiff";
+    else if (mimeExt == QLatin1String("xpm"))
+        return "xpm";
+    return nullptr;
+}
+
 /*!
   \qmlmethod string QtQuick::Canvas::toDataURL(string mimeType)
 
@@ -1112,27 +1133,14 @@ QString QQuickCanvasItem::toDataURL(const QString& mimeType) const
         QByteArray ba;
         QBuffer buffer(&ba);
         buffer.open(QIODevice::WriteOnly);
-        QString mime = mimeType.toLower();
-        QString type;
-        if (mime == QLatin1String("image/png")) {
-            type = QStringLiteral("PNG");
-        } else if (mime == QLatin1String("image/bmp"))
-            type = QStringLiteral("BMP");
-        else if (mime == QLatin1String("image/jpeg"))
-            type = QStringLiteral("JPEG");
-        else if (mime == QLatin1String("image/x-portable-pixmap"))
-            type = QStringLiteral("PPM");
-        else if (mime == QLatin1String("image/tiff"))
-            type = QStringLiteral("TIFF");
-        else if (mime == QLatin1String("image/xpm"))
-            type = QStringLiteral("XPM");
-        else
+        const QString mime = mimeType.toLower();
+        const char* type = mimeToType(mime);
+        if (!type)
             return QStringLiteral("data:,");
 
-        image.save(&buffer, type.toLatin1());
+        image.save(&buffer, type);
         buffer.close();
-        QString dataUrl = QStringLiteral("data:%1;base64,%2");
-        return dataUrl.arg(mime).arg(QLatin1String(ba.toBase64().constData()));
+        return QLatin1String("data:") + mime + QLatin1String(";base64,") + QLatin1String(ba.toBase64().constData());
     }
     return QStringLiteral("data:,");
 }
diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h
index 4f94393a45..8af84d0e7c 100644
--- a/src/quick/items/context2d/qquickcanvasitem_p.h
+++ b/src/quick/items/context2d/qquickcanvasitem_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_canvas);
+
 #include <QtQuick/qquickitem.h>
 #include <private/qv8engine_p.h>
 #include <private/qqmlrefcount_p.h>
@@ -191,7 +195,7 @@ private:
     Q_INVOKABLE void delayedCreate();
     bool createContext(const QString &contextType);
     void initializeContext(QQuickCanvasContext *context, const QVariantMap &args = QVariantMap());
-    QRect tiledRect(const QRectF &window, const QSize &tileSize);
+    static QRect tiledRect(const QRectF &window, const QSize &tileSize);
     bool isPaintConnected();
 };
 
diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h
index b526c8320d..334bf08329 100644
--- a/src/quick/items/context2d/qquickcontext2d_p.h
+++ b/src/quick/items/context2d/qquickcontext2d_p.h
@@ -51,7 +51,10 @@
 // We mean it.
 //
 
-#include <QtQuick/qtquickglobal.h>
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_canvas);
+
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlcomponent.h>
 #include <private/qquickcanvascontext_p.h>
@@ -181,17 +184,17 @@ public:
     QQuickContext2D(QObject *parent = 0);
     ~QQuickContext2D();
 
-    QStringList contextNames() const;
-    void init(QQuickCanvasItem *canvasItem, const QVariantMap &args);
-    void prepare(const QSize& canvasSize, const QSize& tileSize, const QRect& canvasWindow, const QRect& dirtyRect, bool smooth, bool antialiasing);
-    void flush();
+    QStringList contextNames() const override;
+    void init(QQuickCanvasItem *canvasItem, const QVariantMap &args) override;
+    void prepare(const QSize& canvasSize, const QSize& tileSize, const QRect& canvasWindow, const QRect& dirtyRect, bool smooth, bool antialiasing) override;
+    void flush() override;
     void sync();
     QThread *thread() const { return m_thread; }
     QQuickContext2DTexture *texture() const;
-    QImage toImage(const QRectF& bounds);
+    QImage toImage(const QRectF& bounds) override;
 
-    QV4::ReturnedValue v4value() const;
-    void setV4Engine(QV4::ExecutionEngine *eng);
+    QV4::ReturnedValue v4value() const override;
+    void setV4Engine(QV4::ExecutionEngine *eng) override;
 
     QQuickCanvasItem* canvas() const { return m_canvas; }
     QQuickContext2DCommandBuffer* buffer() const { return m_buffer; }
@@ -240,8 +243,8 @@ public:
     QPainterPath createTextGlyphs(qreal x, qreal y, const QString& text);
     QQmlRefPointer<QQuickCanvasPixmap> createPixmap(const QUrl& url);
 
-    QOpenGLContext *glContext() { return m_glContext; }
-    QSurface *surface() { return m_surface.data(); }
+    QOpenGLContext *glContext() const { return m_glContext; }
+    QSurface *surface() const { return m_surface.data(); }
     void setGrabbedImage(const QImage& grab);
 
     State state;
diff --git a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
index f281cec2d5..2a1ac7304e 100644
--- a/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
+++ b/src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_canvas);
+
 #include <QtCore/qmutex.h>
 #include "qquickcontext2d_p.h"
 
@@ -67,7 +71,7 @@ public:
     void reset();
     void clear();
 
-    inline int size() {return commands.size();}
+    inline int size() const { return commands.size(); }
     inline bool isEmpty() const {return commands.isEmpty(); }
     inline bool hasNext() const {return cmdIdx < commands.size(); }
     inline QQuickContext2D::PaintCommand takeNextCommand() { return commands.at(cmdIdx++); }
@@ -245,7 +249,7 @@ public:
     void replay(QPainter* painter, QQuickContext2D::State& state, const QVector2D &scaleFactor);
 
 private:
-    QPen makePen(const QQuickContext2D::State& state);
+    static QPen makePen(const QQuickContext2D::State& state);
     void setPainterState(QPainter* painter, const QQuickContext2D::State& state, const QPen& pen);
     int cmdIdx;
     int intIdx;
diff --git a/src/quick/items/context2d/qquickcontext2dtexture.cpp b/src/quick/items/context2d/qquickcontext2dtexture.cpp
index ddecf7c3d4..4435c0c37b 100644
--- a/src/quick/items/context2d/qquickcontext2dtexture.cpp
+++ b/src/quick/items/context2d/qquickcontext2dtexture.cpp
@@ -548,6 +548,9 @@ QPaintDevice* QQuickContext2DFBOTexture::beginPainting()
 {
     QQuickContext2DTexture::beginPainting();
 
+    const qreal devicePixelRatio = (m_item && m_item->window()) ?
+        m_item->window()->effectiveDevicePixelRatio() : qApp->devicePixelRatio();
+
     if (m_canvasWindow.size().isEmpty()) {
         delete m_fbo;
         delete m_multisampledFbo;
@@ -562,7 +565,7 @@ QPaintDevice* QQuickContext2DFBOTexture::beginPainting()
         delete m_paint_device;
         m_paint_device = 0;
 
-        m_fboSize = npotAdjustedSize(m_canvasWindow.size());
+        m_fboSize = npotAdjustedSize(m_canvasWindow.size() * devicePixelRatio);
         m_canvasWindowChanged = false;
 
         if (doMultisampling()) {
@@ -600,6 +603,7 @@ QPaintDevice* QQuickContext2DFBOTexture::beginPainting()
         QOpenGLPaintDevice *gl_device = new QOpenGLPaintDevice(m_fbo->size());
         gl_device->setPaintFlipped(true);
         gl_device->setSize(m_fbo->size());
+        gl_device->setDevicePixelRatio(devicePixelRatio);
         m_paint_device = gl_device;
     }
 
@@ -705,8 +709,12 @@ QPaintDevice* QQuickContext2DImageTexture::beginPainting()
     if (m_canvasWindow.size().isEmpty())
         return 0;
 
+    const qreal devicePixelRatio = (m_item && m_item->window()) ?
+        m_item->window()->effectiveDevicePixelRatio() : qApp->devicePixelRatio();
+
     if (m_canvasWindowChanged) {
-        m_image = QImage(m_canvasWindow.size(), QImage::Format_ARGB32_Premultiplied);
+        m_image = QImage(m_canvasWindow.size() * devicePixelRatio, QImage::Format_ARGB32_Premultiplied);
+        m_image.setDevicePixelRatio(devicePixelRatio);
         m_image.fill(0x00000000);
         m_canvasWindowChanged = false;
     }
diff --git a/src/quick/items/context2d/qquickcontext2dtexture_p.h b/src/quick/items/context2d/qquickcontext2dtexture_p.h
index ed38382892..678e33826d 100644
--- a/src/quick/items/context2d/qquickcontext2dtexture_p.h
+++ b/src/quick/items/context2d/qquickcontext2dtexture_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_canvas);
+
 #include <QtQuick/qsgtexture.h>
 #include "qquickcanvasitem_p.h"
 #include "qquickcontext2d_p.h"
@@ -120,7 +124,7 @@ public:
 
     // Called during sync() on the scene graph thread while GUI is blocked.
     virtual QSGTexture *textureForNextFrame(QSGTexture *lastFrame, QQuickWindow *window) = 0;
-    bool event(QEvent *e);
+    bool event(QEvent *e) override;
 #ifndef QT_NO_OPENGL
     void initializeOpenGL(QOpenGLContext *gl, QOffscreenSurface *s) {
         m_gl = gl;
@@ -221,17 +225,17 @@ public:
     QQuickContext2DImageTexture();
     ~QQuickContext2DImageTexture();
 
-    virtual QQuickCanvasItem::RenderTarget renderTarget() const;
+    QQuickCanvasItem::RenderTarget renderTarget() const override;
 
-    virtual QQuickContext2DTile* createTile() const;
-    virtual QPaintDevice* beginPainting();
-    virtual void endPainting();
-    virtual void compositeTile(QQuickContext2DTile* tile);
+    QQuickContext2DTile* createTile() const override;
+    QPaintDevice* beginPainting() override;
+    void endPainting() override;
+    void compositeTile(QQuickContext2DTile* tile) override;
 
-    virtual QSGTexture *textureForNextFrame(QSGTexture *lastFrame, QQuickWindow *window);
+    QSGTexture *textureForNextFrame(QSGTexture *lastFrame, QQuickWindow *window) override;
 
 public Q_SLOTS:
-    virtual void grabImage(const QRectF& region = QRectF());
+    void grabImage(const QRectF& region = QRectF()) override;
 
 private:
     QImage m_image;
diff --git a/src/quick/items/context2d/qquickcontext2dtile_p.h b/src/quick/items/context2d/qquickcontext2dtile_p.h
index a87202daae..02238a882b 100644
--- a/src/quick/items/context2d/qquickcontext2dtile_p.h
+++ b/src/quick/items/context2d/qquickcontext2dtile_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_canvas);
+
 #include "qquickcontext2d_p.h"
 #ifndef QT_NO_OPENGL
 # include <QOpenGLFramebufferObject>
@@ -89,12 +93,12 @@ class QQuickContext2DFBOTile : public QQuickContext2DTile
 public:
     QQuickContext2DFBOTile();
     ~QQuickContext2DFBOTile();
-    virtual void setRect(const QRect& r);
+    virtual void setRect(const QRect& r) override;
     QOpenGLFramebufferObject* fbo() const {return m_fbo;}
-    void drawFinished();
+    void drawFinished() override;
 
 protected:
-    void aboutToDraw();
+    void aboutToDraw() override;
 private:
 
 
@@ -106,7 +110,7 @@ class QQuickContext2DImageTile : public QQuickContext2DTile
 public:
     QQuickContext2DImageTile();
     ~QQuickContext2DImageTile();
-    void setRect(const QRect& r);
+    void setRect(const QRect& r) override;
     const QImage& image() const {return m_image;}
 private:
     QImage m_image;
diff --git a/src/quick/items/items.pri b/src/quick/items/items.pri
index d91705451e..0f8061b5ef 100644
--- a/src/quick/items/items.pri
+++ b/src/quick/items/items.pri
@@ -41,19 +41,10 @@ HEADERS += \
     $$PWD/qquickflickable_p.h \
     $$PWD/qquickflickable_p_p.h \
     $$PWD/qquickflickablebehavior_p.h \
-    $$PWD/qquicklistview_p.h \
     $$PWD/qquickrepeater_p.h \
     $$PWD/qquickrepeater_p_p.h \
-    $$PWD/qquickgridview_p.h \
-    $$PWD/qquickpathview_p.h \
-    $$PWD/qquickpathview_p_p.h \
-    $$PWD/qquickpositioners_p.h \
-    $$PWD/qquickpositioners_p_p.h \
     $$PWD/qquickloader_p.h \
     $$PWD/qquickloader_p_p.h \
-    $$PWD/qquickanimatedimage_p.h \
-    $$PWD/qquickanimatedimage_p_p.h \
-    $$PWD/qquickflipable_p.h \
     $$PWD/qquicktranslate_p.h \
     $$PWD/qquickclipnode_p.h \
     $$PWD/qquickview.h \
@@ -66,26 +57,13 @@ HEADERS += \
     $$PWD/qquickdrag_p.h \
     $$PWD/qquickdroparea_p.h \
     $$PWD/qquickmultipointtoucharea_p.h \
-    $$PWD/qquickitemview_p.h \
-    $$PWD/qquickitemview_p_p.h \
-    $$PWD/qquickitemviewtransition_p.h \
     $$PWD/qquickscreen_p.h \
     $$PWD/qquickwindowattached_p.h \
     $$PWD/qquickwindowmodule_p.h \
-    $$PWD/qquickshadereffectsource_p.h \
-    $$PWD/qquickshadereffectmesh_p.h \
-    $$PWD/qquickshadereffect_p.h \
-    $$PWD/qquickgenericshadereffect_p.h \
     $$PWD/qquickrendercontrol.h \
     $$PWD/qquickrendercontrol_p.h \
     $$PWD/qquickgraphicsinfo_p.h \
-    $$PWD/qquickitemgrabresult.h \
-    $$PWD/qquickspriteengine_p.h \
-    $$PWD/qquicksprite_p.h \
-    $$PWD/qquickspritesequence_p.h \
-    $$PWD/qquickanimatedsprite_p.h \
-    $$PWD/qquickanimatedsprite_p_p.h \
-    $$PWD/qquickspritesequence_p_p.h
+    $$PWD/qquickitemgrabresult.h
 
 SOURCES += \
     $$PWD/qquickevents.cpp \
@@ -111,14 +89,8 @@ SOURCES += \
     $$PWD/qquickmousearea.cpp \
     $$PWD/qquickpincharea.cpp \
     $$PWD/qquickflickable.cpp \
-    $$PWD/qquicklistview.cpp \
     $$PWD/qquickrepeater.cpp \
-    $$PWD/qquickgridview.cpp \
-    $$PWD/qquickpathview.cpp \
-    $$PWD/qquickpositioners.cpp \
     $$PWD/qquickloader.cpp \
-    $$PWD/qquickanimatedimage.cpp \
-    $$PWD/qquickflipable.cpp \
     $$PWD/qquicktranslate.cpp \
     $$PWD/qquickclipnode.cpp \
     $$PWD/qquickview.cpp \
@@ -129,49 +101,133 @@ SOURCES += \
     $$PWD/qquickdrag.cpp \
     $$PWD/qquickdroparea.cpp \
     $$PWD/qquickmultipointtoucharea.cpp \
-    $$PWD/qquickitemview.cpp \
-    $$PWD/qquickitemviewtransition.cpp \
     $$PWD/qquickwindowmodule.cpp \
     $$PWD/qquickscreen.cpp \
     $$PWD/qquickwindowattached.cpp \
-    $$PWD/qquickshadereffectsource.cpp \
-    $$PWD/qquickshadereffectmesh.cpp \
-    $$PWD/qquickshadereffect.cpp \
-    $$PWD/qquickgenericshadereffect.cpp \
     $$PWD/qquickrendercontrol.cpp \
     $$PWD/qquickgraphicsinfo.cpp \
-    $$PWD/qquickitemgrabresult.cpp \
-    $$PWD/qquickspriteengine.cpp \
-    $$PWD/qquicksprite.cpp \
-    $$PWD/qquickspritesequence.cpp \
-    $$PWD/qquickanimatedsprite.cpp
+    $$PWD/qquickitemgrabresult.cpp
+
+qtConfig(quick-animatedimage) {
+    HEADERS += \
+        $$PWD/qquickanimatedimage_p.h \
+        $$PWD/qquickanimatedimage_p_p.h
+    SOURCES += \
+        $$PWD/qquickanimatedimage.cpp
+}
+
+qtConfig(quick-gridview) {
+    HEADERS += \
+        $$PWD/qquickgridview_p.h
+    SOURCES += \
+        $$PWD/qquickgridview.cpp
+}
+
+qtConfig(quick-itemview) {
+    HEADERS += \
+        $$PWD/qquickitemview_p.h \
+        $$PWD/qquickitemview_p_p.h
+    SOURCES += \
+        $$PWD/qquickitemview.cpp
+}
+
+qtConfig(quick-viewtransitions) {
+    HEADERS += \
+        $$PWD/qquickitemviewtransition_p.h
+    SOURCES += \
+        $$PWD/qquickitemviewtransition.cpp
+}
+
+qtConfig(quick-listview) {
+    HEADERS += \
+        $$PWD/qquicklistview_p.h
+    SOURCES += \
+        $$PWD/qquicklistview.cpp
+}
+
+qtConfig(quick-pathview) {
+    HEADERS += \
+        $$PWD/qquickpathview_p.h \
+        $$PWD/qquickpathview_p_p.h
+    SOURCES += \
+        $$PWD/qquickpathview.cpp
+}
+
+qtConfig(quick-positioners) {
+    HEADERS += \
+        $$PWD/qquickpositioners_p.h \
+        $$PWD/qquickpositioners_p_p.h
+    SOURCES += \
+        $$PWD/qquickpositioners.cpp
+}
+
+qtConfig(quick-flipable) {
+    HEADERS += \
+        $$PWD/qquickflipable_p.h
+    SOURCES += \
+        $$PWD/qquickflipable.cpp
+}
+
+qtConfig(quick-shadereffect) {
+    HEADERS += \
+        $$PWD/qquickshadereffectsource_p.h \
+        $$PWD/qquickshadereffectmesh_p.h \
+        $$PWD/qquickshadereffect_p.h \
+        $$PWD/qquickgenericshadereffect_p.h
+    SOURCES += \
+        $$PWD/qquickshadereffectsource.cpp \
+        $$PWD/qquickshadereffectmesh.cpp \
+        $$PWD/qquickshadereffect.cpp \
+        $$PWD/qquickgenericshadereffect.cpp
+
+    qtConfig(opengl) {
+        SOURCES += \
+            $$PWD/qquickopenglshadereffect.cpp \
+            $$PWD/qquickopenglshadereffectnode.cpp
+        HEADERS += \
+            $$PWD/qquickopenglshadereffect_p.h \
+            $$PWD/qquickopenglshadereffectnode_p.h
+
+        OTHER_FILES += \
+            $$PWD/shaders/shadereffect.vert \
+            $$PWD/shaders/shadereffect.frag \
+            $$PWD/shaders/shadereffectfallback.vert \
+            $$PWD/shaders/shadereffectfallback.frag \
+            $$PWD/shaders/shadereffect_core.vert \
+            $$PWD/shaders/shadereffect_core.frag \
+            $$PWD/shaders/shadereffectfallback_core.vert \
+            $$PWD/shaders/shadereffectfallback_core.frag
+    }
+}
+
+qtConfig(quick-sprite) {
+    HEADERS += \
+        $$PWD/qquickspriteengine_p.h \
+        $$PWD/qquicksprite_p.h \
+        $$PWD/qquickspritesequence_p.h \
+        $$PWD/qquickanimatedsprite_p.h \
+        $$PWD/qquickanimatedsprite_p_p.h \
+        $$PWD/qquickspritesequence_p_p.h
+    SOURCES += \
+        $$PWD/qquickspriteengine.cpp \
+        $$PWD/qquicksprite.cpp \
+        $$PWD/qquickspritesequence.cpp \
+        $$PWD/qquickanimatedsprite.cpp
+}
 
 # Items that depend on OpenGL Renderer
 qtConfig(opengl(es1|es2)?) {
     SOURCES += \
         $$PWD/qquickopenglinfo.cpp \
-        $$PWD/qquickopenglshadereffect.cpp \
-        $$PWD/qquickopenglshadereffectnode.cpp \
         $$PWD/qquickframebufferobject.cpp
 
     HEADERS += \
         $$PWD/qquickopenglinfo_p.h \
-        $$PWD/qquickopenglshadereffect_p.h \
-        $$PWD/qquickopenglshadereffectnode_p.h \
         $$PWD/qquickframebufferobject.h
-
-    OTHER_FILES += \
-        $$PWD/shaders/shadereffect.vert \
-        $$PWD/shaders/shadereffect.frag \
-        $$PWD/shaders/shadereffectfallback.vert \
-        $$PWD/shaders/shadereffectfallback.frag \
-        $$PWD/shaders/shadereffect_core.vert \
-        $$PWD/shaders/shadereffect_core.frag \
-        $$PWD/shaders/shadereffectfallback_core.vert \
-        $$PWD/shaders/shadereffectfallback_core.frag
 }
 
 RESOURCES += \
     $$PWD/items.qrc
 
-include(context2d/context2d.pri)
+qtConfig(quick-canvas): \
+    include(context2d/context2d.pri)
diff --git a/src/quick/items/qquickaccessibleattached_p.h b/src/quick/items/qquickaccessibleattached_p.h
index 2c209ae664..7054d9d9c9 100644
--- a/src/quick/items/qquickaccessibleattached_p.h
+++ b/src/quick/items/qquickaccessibleattached_p.h
@@ -203,7 +203,7 @@ public:
         return object;
     }
 
-    QAccessible::State state() { return m_state; }
+    QAccessible::State state() const { return m_state; }
     bool ignored() const;
     bool doAction(const QString &actionName);
     void availableActions(QStringList *actions) const;
diff --git a/src/quick/items/qquickanchors.cpp b/src/quick/items/qquickanchors.cpp
index b6978e534e..a7a4a2b882 100644
--- a/src/quick/items/qquickanchors.cpp
+++ b/src/quick/items/qquickanchors.cpp
@@ -285,7 +285,7 @@ void QQuickAnchorsPrivate::clearItem(QQuickItem *item)
     }
 }
 
-QQuickGeometryChange QQuickAnchorsPrivate::calculateDependency(QQuickItem *controlItem)
+QQuickGeometryChange QQuickAnchorsPrivate::calculateDependency(QQuickItem *controlItem) const
 {
     QQuickGeometryChange dependency;
 
@@ -588,7 +588,7 @@ bool QQuickAnchorsPrivate::calcStretch(QQuickItem *edge1Item,
                                        qreal offset1,
                                        qreal offset2,
                                        QQuickAnchors::Anchor line,
-                                       qreal &stretch)
+                                       qreal &stretch) const
 {
     bool edge1IsParent = (edge1Item == readParentItem(item));
     bool edge2IsParent = (edge2Item == readParentItem(item));
diff --git a/src/quick/items/qquickanchors_p_p.h b/src/quick/items/qquickanchors_p_p.h
index 3357e134bf..221b4ccb40 100644
--- a/src/quick/items/qquickanchors_p_p.h
+++ b/src/quick/items/qquickanchors_p_p.h
@@ -124,7 +124,7 @@ public:
 
     void clearItem(QQuickItem *);
 
-    QQuickGeometryChange calculateDependency(QQuickItem *);
+    QQuickGeometryChange calculateDependency(QQuickItem *) const;
     void addDepend(QQuickItem *);
     void remDepend(QQuickItem *);
     bool isItemComplete() const;
@@ -150,7 +150,7 @@ public:
     bool checkVAnchorValid(QQuickAnchorLine anchor) const;
     bool calcStretch(QQuickItem *edge1Item, QQuickAnchors::Anchor edge1Line,
                      QQuickItem *edge2Item, QQuickAnchors::Anchor edge2Line,
-                     qreal offset1, qreal offset2, QQuickAnchors::Anchor line, qreal &stretch);
+                     qreal offset1, qreal offset2, QQuickAnchors::Anchor line, qreal &stretch) const;
 
     bool isMirrored() const;
     void updateHorizontalAnchors();
diff --git a/src/quick/items/qquickanimatedimage.cpp b/src/quick/items/qquickanimatedimage.cpp
index 6f14bf15fe..81c649dbd5 100644
--- a/src/quick/items/qquickanimatedimage.cpp
+++ b/src/quick/items/qquickanimatedimage.cpp
@@ -40,14 +40,12 @@
 #include "qquickanimatedimage_p.h"
 #include "qquickanimatedimage_p_p.h"
 
-#ifndef QT_NO_MOVIE
-
 #include <QtGui/qguiapplication.h>
 #include <QtQml/qqmlinfo.h>
 #include <QtQml/qqmlfile.h>
 #include <QtQml/qqmlengine.h>
 #include <QtGui/qmovie.h>
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
 #include <QtNetwork/qnetworkrequest.h>
 #include <QtNetwork/qnetworkreply.h>
 #endif
@@ -146,7 +144,7 @@ QQuickAnimatedImage::QQuickAnimatedImage(QQuickItem *parent)
 QQuickAnimatedImage::~QQuickAnimatedImage()
 {
     Q_D(QQuickAnimatedImage);
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
     if (d->reply)
         d->reply->deleteLater();
 #endif
@@ -268,7 +266,7 @@ void QQuickAnimatedImage::setSource(const QUrl &url)
     if (url == d->url)
         return;
 
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
     if (d->reply) {
         d->reply->deleteLater();
         d->reply = 0;
@@ -325,7 +323,7 @@ void QQuickAnimatedImage::load()
             d->_movie = new QMovie(lf);
             movieRequestFinished();
         } else {
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
             if (d->status != Loading) {
                 d->status = Loading;
                 emit statusChanged(d->status);
@@ -354,7 +352,7 @@ void QQuickAnimatedImage::movieRequestFinished()
 
     Q_D(QQuickAnimatedImage);
 
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
     if (d->reply) {
         d->redirectCount++;
         if (d->redirectCount < ANIMATEDIMAGE_MAXIMUM_REDIRECT_RECURSION) {
@@ -493,5 +491,3 @@ void QQuickAnimatedImage::componentComplete()
 }
 
 QT_END_NAMESPACE
-
-#endif // QT_NO_MOVIE
diff --git a/src/quick/items/qquickanimatedimage_p.h b/src/quick/items/qquickanimatedimage_p.h
index 288a8379da..143fe8904d 100644
--- a/src/quick/items/qquickanimatedimage_p.h
+++ b/src/quick/items/qquickanimatedimage_p.h
@@ -51,9 +51,11 @@
 // We mean it.
 //
 
-#include "qquickimage_p.h"
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_animatedimage);
 
-#ifndef QT_NO_MOVIE
+#include "qquickimage_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -116,6 +118,4 @@ QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QQuickAnimatedImage)
 
-#endif // QT_NO_MOVIE
-
 #endif // QQUICKANIMATEDIMAGE_P_H
diff --git a/src/quick/items/qquickanimatedimage_p_p.h b/src/quick/items/qquickanimatedimage_p_p.h
index ed735d1c9c..9eff6a44e3 100644
--- a/src/quick/items/qquickanimatedimage_p_p.h
+++ b/src/quick/items/qquickanimatedimage_p_p.h
@@ -51,14 +51,16 @@
 // We mean it.
 //
 
-#include "qquickimage_p_p.h"
+#include <QtQuick/qtquickglobal.h>
+
+QT_REQUIRE_CONFIG(quick_animatedimage);
 
-#ifndef QT_NO_MOVIE
+#include "qquickimage_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 class QMovie;
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
 class QNetworkReply;
 #endif
 
@@ -69,7 +71,7 @@ class QQuickAnimatedImagePrivate : public QQuickImagePrivate
 public:
     QQuickAnimatedImagePrivate()
       : playing(true), paused(false), preset_currentframe(0), _movie(0), oldPlaying(false)
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
         , reply(0), redirectCount(0)
 #endif
         , currentSourceSize(0, 0)
@@ -83,7 +85,7 @@ public:
     int preset_currentframe;
     QMovie *_movie;
     bool oldPlaying;
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
     QNetworkReply *reply;
     int redirectCount;
 #endif
@@ -93,6 +95,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_MOVIE
-
 #endif // QQUICKANIMATEDIMAGE_P_P_H
diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp
index 991ca8519f..8aeef4ef4a 100644
--- a/src/quick/items/qquickanimatedsprite.cpp
+++ b/src/quick/items/qquickanimatedsprite.cpp
@@ -42,6 +42,7 @@
 #include "qquicksprite_p.h"
 #include "qquickspriteengine_p.h"
 #include <QtQuick/private/qsgcontext_p.h>
+#include <QtQuick/private/qquickitem_p.h>
 #include <private/qsgadaptationlayer_p.h>
 #include <private/qqmlglobal_p.h>
 #include <QtQuick/qsgnode.h>
@@ -349,7 +350,7 @@ void QQuickAnimatedSprite::start()
     }
     emit currentFrameChanged(0);
     emit runningChanged(true);
-    update();
+    maybeUpdate();
 }
 
 void QQuickAnimatedSprite::stop()
@@ -360,7 +361,7 @@ void QQuickAnimatedSprite::stop()
         return;
     d->m_pauseOffset = 0;
     emit runningChanged(false);
-    update();
+    maybeUpdate();
 }
 
 /*!
@@ -379,7 +380,15 @@ void QQuickAnimatedSprite::advance(int frames)
         d->m_curFrame += d->m_spriteEngine->maxFrames();
     d->m_curFrame = d->m_curFrame % d->m_spriteEngine->maxFrames();
     emit currentFrameChanged(d->m_curFrame);
-    update();
+    maybeUpdate();
+}
+
+void QQuickAnimatedSprite::maybeUpdate()
+{
+    QQuickItemPrivate *priv = QQuickItemPrivate::get(this);
+    const QLazilyAllocated<QQuickItemPrivate::ExtraData> &extraData = priv->extra;
+    if ((extraData.isAllocated() && extraData->effectRefCount > 0) || priv->effectiveVisible)
+        update();
 }
 
 /*!
@@ -399,7 +408,7 @@ void QQuickAnimatedSprite::pause()
     d->m_pauseOffset = d->m_timestamp.elapsed();
     d->m_paused = true;
     emit pausedChanged(true);
-    update();
+    maybeUpdate();
 }
 
 /*!
@@ -419,7 +428,7 @@ void QQuickAnimatedSprite::resume()
     d->m_pauseOffset = d->m_pauseOffset - d->m_timestamp.elapsed();
     d->m_paused = false;
     emit pausedChanged(false);
-    update();
+    maybeUpdate();
 }
 
 void QQuickAnimatedSprite::setRunning(bool arg)
@@ -610,7 +619,6 @@ void QQuickAnimatedSprite::createEngine()
     d->m_spriteEngine = new QQuickSpriteEngine(QList<QQuickSprite*>(spriteList), this);
     d->m_spriteEngine->startAssemblingImage();
     reset();
-    update();
 }
 
 QSGSpriteNode* QQuickAnimatedSprite::initNode()
@@ -622,10 +630,10 @@ QSGSpriteNode* QQuickAnimatedSprite::initNode()
         return nullptr;
     } else if (d->m_spriteEngine->status() == QQuickPixmap::Null) {
         d->m_spriteEngine->startAssemblingImage();
-        update();//Schedule another update, where we will check again
+        maybeUpdate();//Schedule another update, where we will check again
         return nullptr;
     } else if (d->m_spriteEngine->status() == QQuickPixmap::Loading) {
-        update();//Schedule another update, where we will check again
+        maybeUpdate();//Schedule another update, where we will check again
         return nullptr;
     }
 
@@ -651,7 +659,7 @@ void QQuickAnimatedSprite::reset()
 {
     Q_D(QQuickAnimatedSprite);
     d->m_pleaseReset = true;
-    update();
+    maybeUpdate();
 }
 
 QSGNode *QQuickAnimatedSprite::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
@@ -673,7 +681,7 @@ QSGNode *QQuickAnimatedSprite::updatePaintNode(QSGNode *oldNode, UpdatePaintNode
         prepareNextFrame(node);
 
     if (d->m_running && !d->m_paused)
-        update();
+        maybeUpdate();
 
     return node;
 }
@@ -726,7 +734,7 @@ void QQuickAnimatedSprite::prepareNextFrame(QSGSpriteNode *node)
             frameAt = 0;
             d->m_running = false;
             emit runningChanged(false);
-            update();
+            maybeUpdate();
         }
     } else {
         frameAt = d->m_curFrame;
@@ -734,7 +742,7 @@ void QQuickAnimatedSprite::prepareNextFrame(QSGSpriteNode *node)
     if (d->m_curFrame != lastFrame) {
         if (isCurrentFrameChangedConnected())
             emit currentFrameChanged(d->m_curFrame);
-        update();
+        maybeUpdate();
     }
 
     qreal frameCount = d->m_spriteEngine->spriteFrames();
diff --git a/src/quick/items/qquickanimatedsprite_p.h b/src/quick/items/qquickanimatedsprite_p.h
index cbd6524c40..850461a011 100644
--- a/src/quick/items/qquickanimatedsprite_p.h
+++ b/src/quick/items/qquickanimatedsprite_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_sprite);
+
 #include <QtQuick/QQuickItem>
 #include <private/qquicksprite_p.h>
 #include <QtCore/qelapsedtimer.h>
@@ -168,6 +172,7 @@ protected:
     void componentComplete() Q_DECL_OVERRIDE;
     QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
 private:
+    void maybeUpdate();
     bool isCurrentFrameChangedConnected();
     void prepareNextFrame(QSGSpriteNode *node);
     void reloadImage();
diff --git a/src/quick/items/qquickanimatedsprite_p_p.h b/src/quick/items/qquickanimatedsprite_p_p.h
index 0e4a1e9066..3610e58861 100644
--- a/src/quick/items/qquickanimatedsprite_p_p.h
+++ b/src/quick/items/qquickanimatedsprite_p_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <QtQuick/qtquickglobal.h>
+
+QT_REQUIRE_CONFIG(quick_sprite);
+
 #include "qquickitem_p.h"
 #include "qquicksprite_p.h"
 
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp
index ca5ad8dbbd..67b99bfbc6 100644
--- a/src/quick/items/qquickborderimage.cpp
+++ b/src/quick/items/qquickborderimage.cpp
@@ -43,7 +43,7 @@
 #include <QtQml/qqmlinfo.h>
 #include <QtQml/qqmlfile.h>
 #include <QtQml/qqmlengine.h>
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
 #include <QtNetwork/qnetworkreply.h>
 #endif
 #include <QtCore/qfile.h>
@@ -51,6 +51,7 @@
 #include <QtGui/qguiapplication.h>
 
 #include <private/qqmlglobal_p.h>
+#include <private/qsgadaptationlayer_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -171,7 +172,7 @@ QQuickBorderImage::QQuickBorderImage(QQuickItem *parent)
 
 QQuickBorderImage::~QQuickBorderImage()
 {
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
     Q_D(QQuickBorderImage);
     if (d->sciReply)
         d->sciReply->deleteLater();
@@ -274,7 +275,7 @@ void QQuickBorderImage::setSource(const QUrl &url)
     if (url == d->url)
         return;
 
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
     if (d->sciReply) {
         d->sciReply->deleteLater();
         d->sciReply = 0;
@@ -317,7 +318,7 @@ void QQuickBorderImage::load()
                 setGridScaledImage(QQuickGridScaledImage(&file));
                 return;
             } else {
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
                 if (d->progress != 0.0) {
                     d->progress = 0.0;
                     emit progressChanged(d->progress);
@@ -537,7 +538,7 @@ void QQuickBorderImage::requestFinished()
     pixmapChange();
 }
 
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
 #define BORDERIMAGE_MAX_REDIRECT 16
 
 void QQuickBorderImage::sciRequestFinished()
@@ -567,7 +568,7 @@ void QQuickBorderImage::sciRequestFinished()
         setGridScaledImage(sci);
     }
 }
-#endif // QT_NO_NETWORK
+#endif // qml_network
 
 void QQuickBorderImage::doUpdate()
 {
diff --git a/src/quick/items/qquickborderimage_p.h b/src/quick/items/qquickborderimage_p.h
index f2764660f6..844f71e2c9 100644
--- a/src/quick/items/qquickborderimage_p.h
+++ b/src/quick/items/qquickborderimage_p.h
@@ -101,7 +101,7 @@ private:
 private Q_SLOTS:
     void doUpdate();
     void requestFinished() Q_DECL_OVERRIDE;
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
     void sciRequestFinished();
 #endif
 
diff --git a/src/quick/items/qquickborderimage_p_p.h b/src/quick/items/qquickborderimage_p_p.h
index 56fbbab049..0f4e7acc05 100644
--- a/src/quick/items/qquickborderimage_p_p.h
+++ b/src/quick/items/qquickborderimage_p_p.h
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
 class QNetworkReply;
 #endif
 class QQuickBorderImagePrivate : public QQuickImageBasePrivate
@@ -69,7 +69,7 @@ public:
     QQuickBorderImagePrivate()
       : border(0), horizontalTileMode(QQuickBorderImage::Stretch),
         verticalTileMode(QQuickBorderImage::Stretch), pixmapChanged(false)
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
       , sciReply(0), redirectCount(0)
 #endif
     {
@@ -108,7 +108,7 @@ public:
     QQuickBorderImage::TileMode verticalTileMode;
     bool pixmapChanged : 1;
 
-#ifndef QT_NO_NETWORK
+#if QT_CONFIG(qml_network)
     QNetworkReply *sciReply;
     int redirectCount;
 #endif
diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index b943c28661..cbb052856e 100644
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -749,7 +749,7 @@ void QQuickDragAttached::cancel()
  */
 
 /*!
-    \qmlattachedsignal QtQuick::Drag::dragFinished(DropAction action)
+    \qmlattachedsignal QtQuick::Drag::dragFinished(DropAction dropAction)
 
     This signal is emitted when a drag finishes and the drag was started with the
     \l startDrag() method or started automatically using the \l dragType property.
diff --git a/src/quick/items/qquickdrag_p.h b/src/quick/items/qquickdrag_p.h
index 17721251d9..f9faca55e0 100644
--- a/src/quick/items/qquickdrag_p.h
+++ b/src/quick/items/qquickdrag_p.h
@@ -290,7 +290,7 @@ public:
 
     Q_INVOKABLE int drop();
 
-    bool event(QEvent *event);
+    bool event(QEvent *event) override;
 
 public Q_SLOTS:
     void start(QQmlV4Function *);
diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index 8dcc13971e..70d76c99a1 100644
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -513,7 +513,7 @@ void QQuickDropArea::dropEvent(QDropEvent *event)
     easily be translated into a QByteArray. \a format should be one contained in the \l formats property.
 */
 
-QObject *QQuickDropEvent::source()
+QObject *QQuickDropEvent::source() const
 {
     if (const QQuickDragMimeData *dragMime = qobject_cast<const QQuickDragMimeData *>(event->mimeData()))
         return dragMime->source();
diff --git a/src/quick/items/qquickdroparea_p.h b/src/quick/items/qquickdroparea_p.h
index d3b37979da..ecd4da4367 100644
--- a/src/quick/items/qquickdroparea_p.h
+++ b/src/quick/items/qquickdroparea_p.h
@@ -86,7 +86,7 @@ public:
     qreal x() const { return event->pos().x(); }
     qreal y() const { return event->pos().y(); }
 
-    QObject *source();
+    QObject *source() const;
 
     Qt::DropActions supportedActions() const { return event->possibleActions(); }
     Qt::DropActions proposedAction() const { return event->proposedAction(); }
diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 672aadd0e3..1fd9014408 100644
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -1038,7 +1038,7 @@ Q_QUICK_PRIVATE_EXPORT QDebug operator<<(QDebug dbg, const QQuickEventPoint *eve
     dbg << "QQuickEventPoint(valid:" << event->isValid() << " accepted:" << event->isAccepted()
         << " state:";
     QtDebugUtils::formatQEnum(dbg, event->state());
-    dbg << " scenePos:" << event->scenePos() << " id:" << event->pointId()
+    dbg << " scenePos:" << event->scenePos() << " id:" << hex << event->pointId() << dec
         << " timeHeld:" << event->timeHeld() << ')';
     return dbg;
 }
diff --git a/src/quick/items/qquickflickable.cpp b/src/quick/items/qquickflickable.cpp
index 6160e1ca1a..ef5ece625e 100644
--- a/src/quick/items/qquickflickable.cpp
+++ b/src/quick/items/qquickflickable.cpp
@@ -278,7 +278,7 @@ void QQuickFlickablePrivate::init()
     Returns the amount to overshoot by given a velocity.
     Will be roughly in range 0 - size/4
 */
-qreal QQuickFlickablePrivate::overShootDistance(qreal size)
+qreal QQuickFlickablePrivate::overShootDistance(qreal size) const
 {
     if (maxVelocity <= 0)
         return 0.0;
@@ -875,9 +875,9 @@ bool QQuickFlickable::isAtYBeginning() const
     }
     \endcode
 */
-QQuickItem *QQuickFlickable::contentItem()
+QQuickItem *QQuickFlickable::contentItem() const
 {
-    Q_D(QQuickFlickable);
+    Q_D(const QQuickFlickable);
     return d->contentItem;
 }
 
@@ -952,7 +952,7 @@ void QQuickFlickable::setPixelAligned(bool align)
     }
 }
 
-qint64 QQuickFlickablePrivate::computeCurrentTime(QInputEvent *event)
+qint64 QQuickFlickablePrivate::computeCurrentTime(QInputEvent *event) const
 {
     if (0 != event->timestamp())
         return event->timestamp();
@@ -961,7 +961,7 @@ qint64 QQuickFlickablePrivate::computeCurrentTime(QInputEvent *event)
     return timer.elapsed();
 }
 
-qreal QQuickFlickablePrivate::devicePixelRatio()
+qreal QQuickFlickablePrivate::devicePixelRatio() const
 {
     return (window ? window->effectiveDevicePixelRatio() : qApp->devicePixelRatio());
 }
@@ -1557,11 +1557,11 @@ void QQuickFlickablePrivate::replayDelayedPress()
 
         // If we have the grab, release before delivering the event
         if (QQuickWindow *w = q->window()) {
+            replayingPressEvent = true;
             if (w->mouseGrabberItem() == q)
                 q->ungrabMouse();
 
             // Use the event handler that will take care of finding the proper item to propagate the event
-            replayingPressEvent = true;
             QCoreApplication::sendEvent(w, mouseEvent.data());
             replayingPressEvent = false;
         }
@@ -1591,7 +1591,7 @@ void QQuickFlickable::timerEvent(QTimerEvent *event)
         d->movementEndingTimer.stop();
         d->pressed = false;
         d->stealMouse = false;
-        if (!d->velocityTimeline.isActive())
+        if (!d->velocityTimeline.isActive() && !d->timeline.isActive())
             movementEnding(true, true);
     }
 }
@@ -1644,7 +1644,7 @@ void QQuickFlickable::viewportMoved(Qt::Orientations orient)
 void QQuickFlickablePrivate::viewportAxisMoved(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
                                            QQuickTimeLineCallback::Callback fixupCallback)
 {
-    if (pressed || calcVelocity) {
+    if (!scrollingPhase && (pressed || calcVelocity)) {
         int elapsed = data.velocityTime.restart();
         if (elapsed > 0) {
             qreal velocity = (data.lastPos - data.move.value()) * 1000 / elapsed;
@@ -2219,7 +2219,8 @@ void QQuickFlickable::mouseUngrabEvent()
     Q_D(QQuickFlickable);
     // if our mouse grab has been removed (probably by another Flickable),
     // fix our state
-    d->cancelInteraction();
+    if (!d->replayingPressEvent)
+        d->cancelInteraction();
 }
 
 void QQuickFlickablePrivate::cancelInteraction()
diff --git a/src/quick/items/qquickflickable_p.h b/src/quick/items/qquickflickable_p.h
index 610bfd1427..2da4781f37 100644
--- a/src/quick/items/qquickflickable_p.h
+++ b/src/quick/items/qquickflickable_p.h
@@ -190,7 +190,7 @@ public:
     bool isAtYEnd() const;
     bool isAtYBeginning() const;
 
-    QQuickItem *contentItem();
+    QQuickItem *contentItem() const;
 
     enum FlickableDirection { AutoFlickDirection=0x0, HorizontalFlick=0x1, VerticalFlick=0x2, HorizontalAndVerticalFlick=0x3,
                               AutoFlickIfNeeded=0xc };
diff --git a/src/quick/items/qquickflickable_p_p.h b/src/quick/items/qquickflickable_p_p.h
index ac1e39d829..0c3bc21071 100644
--- a/src/quick/items/qquickflickable_p_p.h
+++ b/src/quick/items/qquickflickable_p_p.h
@@ -192,7 +192,7 @@ public:
     void setViewportX(qreal x);
     void setViewportY(qreal y);
 
-    qreal overShootDistance(qreal size);
+    qreal overShootDistance(qreal size) const;
 
     void itemGeometryChanged(QQuickItem *, QQuickGeometryChange, const QRectF &) Q_DECL_OVERRIDE;
 
@@ -260,8 +260,8 @@ public:
               const QVector2D &deltas, bool overThreshold, bool momentum,
               bool velocitySensitiveOverBounds, const QVector2D &velocity);
 
-    qint64 computeCurrentTime(QInputEvent *event);
-    qreal devicePixelRatio();
+    qint64 computeCurrentTime(QInputEvent *event) const;
+    qreal devicePixelRatio() const;
 
     // flickableData property
     static void data_append(QQmlListProperty<QObject> *, QObject *);
diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp
index 342e6c07b8..6a6b6c00a9 100644
--- a/src/quick/items/qquickflipable.cpp
+++ b/src/quick/items/qquickflipable.cpp
@@ -143,7 +143,7 @@ QQuickFlipable::~QQuickFlipable()
   The front and back sides of the flipable.
 */
 
-QQuickItem *QQuickFlipable::front()
+QQuickItem *QQuickFlipable::front() const
 {
     Q_D(const QQuickFlipable);
     return d->front;
diff --git a/src/quick/items/qquickflipable_p.h b/src/quick/items/qquickflipable_p.h
index 189d94775a..a76977d4ac 100644
--- a/src/quick/items/qquickflipable_p.h
+++ b/src/quick/items/qquickflipable_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_flipable);
+
 #include "qquickitem.h"
 
 #include <QtGui/qtransform.h>
@@ -73,7 +77,7 @@ public:
     QQuickFlipable(QQuickItem *parent=0);
     ~QQuickFlipable();
 
-    QQuickItem *front();
+    QQuickItem *front() const;
     void setFront(QQuickItem *);
 
     QQuickItem *back();
diff --git a/src/quick/items/qquickframebufferobject.cpp b/src/quick/items/qquickframebufferobject.cpp
index 857cd44b15..18a6a58467 100644
--- a/src/quick/items/qquickframebufferobject.cpp
+++ b/src/quick/items/qquickframebufferobject.cpp
@@ -42,6 +42,8 @@
 #include <QtGui/QOpenGLFramebufferObject>
 #include <QtGui/QOpenGLFunctions>
 #include <private/qquickitem_p.h>
+#include <private/qsgadaptationlayer_p.h>
+#include <qsgtextureprovider.h>
 
 #include <QSGSimpleTextureNode>
 #include <QSGRendererInterface>
diff --git a/src/quick/items/qquickgenericshadereffect.cpp b/src/quick/items/qquickgenericshadereffect.cpp
index 9714f39663..2f8d71fc11 100644
--- a/src/quick/items/qquickgenericshadereffect.cpp
+++ b/src/quick/items/qquickgenericshadereffect.cpp
@@ -510,9 +510,9 @@ void QQuickGenericShaderEffect::updateShaderVars(Shader shaderType)
         QSGShaderEffectNode::VariableData &vd(m_shaders[shaderType].varData[i]);
         const bool isSpecial = v.name.startsWith("qt_"); // special names not mapped to properties
         if (isSpecial) {
-            if (v.name == QByteArrayLiteral("qt_Opacity"))
+            if (v.name == "qt_Opacity")
                 vd.specialType = QSGShaderEffectNode::VariableData::Opacity;
-            else if (v.name == QByteArrayLiteral("qt_Matrix"))
+            else if (v.name == "qt_Matrix")
                 vd.specialType = QSGShaderEffectNode::VariableData::Matrix;
             else if (v.name.startsWith("qt_SubRect_"))
                 vd.specialType = QSGShaderEffectNode::VariableData::SubRect;
diff --git a/src/quick/items/qquickgridview_p.h b/src/quick/items/qquickgridview_p.h
index 44bc8444f2..aaf6e4a75b 100644
--- a/src/quick/items/qquickgridview_p.h
+++ b/src/quick/items/qquickgridview_p.h
@@ -51,8 +51,11 @@
 // We mean it.
 //
 
-#include "qquickitemview_p.h"
+#include <QtQuick/private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_gridview);
 
+#include "qquickitemview_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index e36c070248..f71a2fbdbd 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -69,7 +69,7 @@ public:
         emit textureChanged();
     }
 
-    QSGTexture *texture() const {
+    QSGTexture *texture() const override {
         if (m_texture) {
             m_texture->setFiltering(m_smooth ? QSGTexture::Linear : QSGTexture::Nearest);
             m_texture->setMipmapFiltering(m_mipmap ? QSGTexture::Linear : QSGTexture::None);
@@ -304,6 +304,15 @@ void QQuickImage::setFillMode(FillMode mode)
     if (d->fillMode == mode)
         return;
     d->fillMode = mode;
+    if ((mode == PreserveAspectCrop) != d->providerOptions.preserveAspectRatioCrop()) {
+        d->providerOptions.setPreserveAspectRatioCrop(mode == PreserveAspectCrop);
+        if (isComponentComplete())
+            load();
+    } else if ((mode == PreserveAspectFit) != d->providerOptions.preserveAspectRatioFit()) {
+        d->providerOptions.setPreserveAspectRatioFit(mode == PreserveAspectFit);
+        if (isComponentComplete())
+            load();
+    }
     update();
     updatePaintedGeometry();
     emit fillModeChanged();
@@ -423,7 +432,9 @@ qreal QQuickImage::paintedHeight() const
     (The \l fillMode is independent of this.)
 
     If both the sourceSize.width and sourceSize.height are set the image will be scaled
-    down to fit within the specified size, maintaining the image's aspect ratio.  The actual
+    down to fit within the specified size (unless PreserveAspectCrop or PreserveAspectFit
+    are used, then it will be scaled to match the optimal size for cropping/fitting),
+    maintaining the image's aspect ratio.  The actual
     size of the image after scaling is available via \l Item::implicitWidth and \l Item::implicitHeight.
 
     If the source is an intrinsically scalable image (eg. SVG), this property
diff --git a/src/quick/items/qquickimagebase.cpp b/src/quick/items/qquickimagebase.cpp
index a2b99b6395..a6bf6b4e8a 100644
--- a/src/quick/items/qquickimagebase.cpp
+++ b/src/quick/items/qquickimagebase.cpp
@@ -246,7 +246,7 @@ void QQuickImageBase::load()
             resolve2xLocalFile(d->url, targetDevicePixelRatio, &loadUrl, &d->devicePixelRatio);
         }
 
-        d->pix.load(qmlEngine(this), loadUrl, d->sourcesize * d->devicePixelRatio, options, d->autoTransform);
+        d->pix.load(qmlEngine(this), loadUrl, d->sourcesize * d->devicePixelRatio, options, d->providerOptions);
 
         if (d->pix.isLoading()) {
             if (d->progress != 0.0) {
@@ -381,17 +381,18 @@ void QQuickImageBase::resolve2xLocalFile(const QUrl &url, qreal targetDevicePixe
 bool QQuickImageBase::autoTransform() const
 {
     Q_D(const QQuickImageBase);
-    if (d->autoTransform == UsePluginDefault)
-        return d->pix.autoTransform() == ApplyTransform;
-    return d->autoTransform == ApplyTransform;
+    if (d->providerOptions.autoTransform() == QQuickImageProviderOptions::UsePluginDefaultTransform)
+        return d->pix.autoTransform() == QQuickImageProviderOptions::ApplyTransform;
+    return d->providerOptions.autoTransform() == QQuickImageProviderOptions::ApplyTransform;
 }
 
 void QQuickImageBase::setAutoTransform(bool transform)
 {
     Q_D(QQuickImageBase);
-    if (d->autoTransform != UsePluginDefault && transform == (d->autoTransform == ApplyTransform))
+    if (d->providerOptions.autoTransform() != QQuickImageProviderOptions::UsePluginDefaultTransform &&
+        transform == (d->providerOptions.autoTransform() == QQuickImageProviderOptions::ApplyTransform))
         return;
-    d->autoTransform = transform ? ApplyTransform : DoNotApplyTransform;
+    d->providerOptions.setAutoTransform(transform ? QQuickImageProviderOptions::ApplyTransform : QQuickImageProviderOptions::DoNotApplyTransform);
     emitAutoTransformBaseChanged();
 }
 
diff --git a/src/quick/items/qquickimagebase_p_p.h b/src/quick/items/qquickimagebase_p_p.h
index 1eb566a3c8..d9b609c7fe 100644
--- a/src/quick/items/qquickimagebase_p_p.h
+++ b/src/quick/items/qquickimagebase_p_p.h
@@ -68,7 +68,6 @@ public:
       : status(QQuickImageBase::Null),
         progress(0.0),
         devicePixelRatio(1.0),
-        autoTransform(UsePluginDefault),
         async(false),
         cache(true),
         mirror(false),
@@ -83,7 +82,7 @@ public:
     QSize sourcesize;
     QSize oldSourceSize;
     qreal devicePixelRatio;
-    AutoTransform autoTransform;
+    QQuickImageProviderOptions providerOptions;
     bool async : 1;
     bool cache : 1;
     bool mirror: 1;
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index a448a6e86c..3604dfde13 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -776,7 +776,7 @@ const SigMap sigMap[] = {
     { 0, 0 }
 };
 
-const QByteArray QQuickKeysAttached::keyToSignal(int key)
+QByteArray QQuickKeysAttached::keyToSignal(int key)
 {
     QByteArray keySignal;
     if (key >= Qt::Key_0 && key <= Qt::Key_9) {
@@ -791,9 +791,9 @@ const QByteArray QQuickKeysAttached::keyToSignal(int key)
     return keySignal;
 }
 
-bool QQuickKeysAttached::isConnected(const char *signalName)
+bool QQuickKeysAttached::isConnected(const char *signalName) const
 {
-    Q_D(QQuickKeysAttached);
+    Q_D(const QQuickKeysAttached);
     int signal_index = d->signalIndex(signalName);
     return d->isSignalConnected(signal_index);
 }
@@ -2346,7 +2346,9 @@ QQuickItem::~QQuickItem()
 
     if (d->extra.isAllocated()) {
         delete d->extra->contents; d->extra->contents = 0;
+#if QT_CONFIG(quick_shadereffect)
         delete d->extra->layer; d->extra->layer = 0;
+#endif
     }
 
     delete d->_anchors; d->_anchors = 0;
@@ -4299,12 +4301,12 @@ void QQuickItem::polish()
   */
 void QQuickItem::mapFromItem(QQmlV4Function *args) const
 {
+    QV4::ExecutionEngine *v4 = args->v4engine();
     if (args->length() != 3 && args->length() != 5) {
-        args->v4engine()->throwTypeError();
+        v4->throwTypeError();
         return;
     }
 
-    QV4::ExecutionEngine *v4 = args->v4engine();
     QV4::Scope scope(v4);
     QV4::ScopedValue item(scope, (*args)[0]);
 
@@ -4318,7 +4320,7 @@ void QQuickItem::mapFromItem(QQmlV4Function *args) const
     if (!itemObj && !item->isNull()) {
         qmlInfo(this) << "mapFromItem() given argument \"" << item->toQStringNoThrow()
                       << "\" which is neither null nor an Item";
-        args->v4engine()->throwTypeError();
+        v4->throwTypeError();
         return;
     }
 
@@ -4326,7 +4328,7 @@ void QQuickItem::mapFromItem(QQmlV4Function *args) const
     QV4::ScopedValue vy(scope, (*args)[2]);
 
     if (!vx->isNumber() || !vy->isNumber()) {
-        args->v4engine()->throwTypeError();
+        v4->throwTypeError();
         return;
     }
 
@@ -4339,7 +4341,7 @@ void QQuickItem::mapFromItem(QQmlV4Function *args) const
         QV4::ScopedValue vw(scope, (*args)[3]);
         QV4::ScopedValue vh(scope, (*args)[4]);
         if (!vw->isNumber() || !vh->isNumber()) {
-            args->v4engine()->throwTypeError();
+            v4->throwTypeError();
             return;
         }
         qreal w = vw->asDouble();
@@ -4387,12 +4389,12 @@ QTransform QQuickItem::itemTransform(QQuickItem *other, bool *ok) const
   */
 void QQuickItem::mapToItem(QQmlV4Function *args) const
 {
+    QV4::ExecutionEngine *v4 = args->v4engine();
     if (args->length() != 3 && args->length() != 5) {
-        args->v4engine()->throwTypeError();
+        v4->throwTypeError();
         return;
     }
 
-    QV4::ExecutionEngine *v4 = args->v4engine();
     QV4::Scope scope(v4);
     QV4::ScopedValue item(scope, (*args)[0]);
 
@@ -4406,7 +4408,7 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const
     if (!itemObj && !item->isNull()) {
         qmlInfo(this) << "mapToItem() given argument \"" << item->toQStringNoThrow()
                       << "\" which is neither null nor an Item";
-        args->v4engine()->throwTypeError();
+        v4->throwTypeError();
         return;
     }
 
@@ -4414,7 +4416,7 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const
     QV4::ScopedValue vy(scope, (*args)[2]);
 
     if (!vx->isNumber() || !vy->isNumber()) {
-        args->v4engine()->throwTypeError();
+        v4->throwTypeError();
         return;
     }
 
@@ -4427,7 +4429,7 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const
         QV4::ScopedValue vw(scope, (*args)[3]);
         QV4::ScopedValue vh(scope, (*args)[4]);
         if (!vw->isNumber() || !vh->isNumber()) {
-            args->v4engine()->throwTypeError();
+            v4->throwTypeError();
             return;
         }
         qreal w = vw->asDouble();
@@ -4443,6 +4445,76 @@ void QQuickItem::mapToItem(QQmlV4Function *args) const
 }
 
 /*!
+    \since 5.7
+    \qmlmethod object QtQuick::Item::mapFromGlobal(real x, real y)
+
+    Maps the point (\a x, \a y), which is in the global coordinate system, to the
+    item's coordinate system, and returns a \l point  matching the mapped coordinate.
+*/
+/*!
+    \internal
+  */
+void QQuickItem::mapFromGlobal(QQmlV4Function *args) const
+{
+    QV4::ExecutionEngine *v4 = args->v4engine();
+    if (args->length() != 2) {
+        v4->throwTypeError();
+        return;
+    }
+
+    QV4::Scope scope(v4);
+    QV4::ScopedValue vx(scope, (*args)[0]);
+    QV4::ScopedValue vy(scope, (*args)[1]);
+
+    if (!vx->isNumber() || !vy->isNumber()) {
+        v4->throwTypeError();
+        return;
+    }
+
+    qreal x = vx->asDouble();
+    qreal y = vy->asDouble();
+    QVariant result = mapFromGlobal(QPointF(x, y));
+
+    QV4::ScopedObject rv(scope, v4->fromVariant(result));
+    args->setReturnValue(rv.asReturnedValue());
+}
+
+/*!
+    \since 5.7
+    \qmlmethod object QtQuick::Item::mapToGlobal(real x, real y)
+
+    Maps the point (\a x, \a y), which is in this item's coordinate system, to the
+    global coordinate system, and returns a \l point  matching the mapped coordinate.
+*/
+/*!
+    \internal
+  */
+void QQuickItem::mapToGlobal(QQmlV4Function *args) const
+{
+    QV4::ExecutionEngine *v4 = args->v4engine();
+    if (args->length() != 2) {
+        v4->throwTypeError();
+        return;
+    }
+
+    QV4::Scope scope(v4);
+    QV4::ScopedValue vx(scope, (*args)[0]);
+    QV4::ScopedValue vy(scope, (*args)[1]);
+
+    if (!vx->isNumber() || !vy->isNumber()) {
+        v4->throwTypeError();
+        return;
+    }
+
+    qreal x = vx->asDouble();
+    qreal y = vy->asDouble();
+    QVariant result = mapToGlobal(QPointF(x, y));
+
+    QV4::ScopedObject rv(scope, v4->fromVariant(result));
+    args->setReturnValue(rv.asReturnedValue());
+}
+
+/*!
     \qmlmethod QtQuick::Item::forceActiveFocus()
 
     Forces active focus on the item.
@@ -4778,8 +4850,10 @@ void QQuickItem::classBegin()
         d->_stateGroup->classBegin();
     if (d->_anchors)
         d->_anchors->classBegin();
+#if QT_CONFIG(quick_shadereffect)
     if (d->extra.isAllocated() && d->extra->layer)
         d->extra->layer->classBegin();
+#endif
 }
 
 /*!
@@ -4799,8 +4873,10 @@ void QQuickItem::componentComplete()
     }
 
     if (d->extra.isAllocated()) {
+#if QT_CONFIG(quick_shadereffect)
         if (d->extra->layer)
             d->extra->layer->componentComplete();
+#endif
 
         if (d->extra->keyHandler)
             d->extra->keyHandler->componentComplete();
@@ -4856,8 +4932,10 @@ QPointF QQuickItemPrivate::computeTransformOrigin() const
 
 void QQuickItemPrivate::transformChanged()
 {
+#if QT_CONFIG(quick_shadereffect)
     if (extra.isAllocated() && extra->layer)
         extra->layer->updateMatrix();
+#endif
 }
 
 void QQuickItemPrivate::deliverKeyEvent(QKeyEvent *e)
@@ -5250,8 +5328,10 @@ void QQuickItem::setZ(qreal v)
 
     emit zChanged();
 
+#if QT_CONFIG(quick_shadereffect)
     if (d->extra.isAllocated() && d->extra->layer)
         d->extra->layer->updateZ();
+#endif
 }
 
 /*!
@@ -6238,7 +6318,7 @@ QPointF QQuickItem::position() const
 void QQuickItem::setX(qreal v)
 {
     Q_D(QQuickItem);
-    if (qIsNaN(v))
+    if (qt_is_nan(v))
         return;
     if (d->x == v)
         return;
@@ -6255,7 +6335,7 @@ void QQuickItem::setX(qreal v)
 void QQuickItem::setY(qreal v)
 {
     Q_D(QQuickItem);
-    if (qIsNaN(v))
+    if (qt_is_nan(v))
         return;
     if (d->y == v)
         return;
@@ -7038,15 +7118,6 @@ void QQuickItemPrivate::setHasHoverInChild(bool hasHover)
     }
 }
 
-void QQuickItemPrivate::markObjects(QV4::ExecutionEngine *e)
-{
-    Q_Q(QQuickItem);
-    QV4::QObjectWrapper::markWrapper(q, e);
-
-    for (QQuickItem *child : qAsConst(childItems))
-        QQuickItemPrivate::get(child)->markObjects(e);
-}
-
 #ifndef QT_NO_CURSOR
 
 /*!
@@ -7662,9 +7733,13 @@ QDebug operator<<(QDebug debug, QQuickItem *item)
 
 bool QQuickItem::isTextureProvider() const
 {
+#if QT_CONFIG(quick_shadereffect)
     Q_D(const QQuickItem);
     return d->extra.isAllocated() && d->extra->layer && d->extra->layer->effectSource() ?
            d->extra->layer->effectSource()->isTextureProvider() : false;
+#else
+    return false;
+#endif
 }
 
 /*!
@@ -7678,9 +7753,13 @@ bool QQuickItem::isTextureProvider() const
 
 QSGTextureProvider *QQuickItem::textureProvider() const
 {
+#if QT_CONFIG(quick_shadereffect)
     Q_D(const QQuickItem);
     return d->extra.isAllocated() && d->extra->layer && d->extra->layer->effectSource() ?
            d->extra->layer->effectSource()->textureProvider() : 0;
+#else
+    return 0;
+#endif
 }
 
 /*!
@@ -7689,14 +7768,19 @@ QSGTextureProvider *QQuickItem::textureProvider() const
   */
 QQuickItemLayer *QQuickItemPrivate::layer() const
 {
+#if QT_CONFIG(quick_shadereffect)
     if (!extra.isAllocated() || !extra->layer) {
         extra.value().layer = new QQuickItemLayer(const_cast<QQuickItem *>(q_func()));
         if (!componentComplete)
             extra->layer->classBegin();
     }
     return extra->layer;
+#else
+    return 0;
+#endif
 }
 
+#if QT_CONFIG(quick_shadereffect)
 QQuickItemLayer::QQuickItemLayer(QQuickItem *item)
     : m_item(item)
     , m_enabled(false)
@@ -8184,12 +8268,16 @@ void QQuickItemLayer::updateMatrix()
         ld->extra.value().origin = QQuickItemPrivate::get(m_item)->origin();
     ld->dirty(QQuickItemPrivate::Transform);
 }
+#endif // quick_shadereffect
 
 QQuickItemPrivate::ExtraData::ExtraData()
 : z(0), scale(1), rotation(0), opacity(1),
   contents(0), screenAttached(0), layoutDirectionAttached(0),
   enterKeyAttached(0),
-  keyHandler(0), layer(0),
+  keyHandler(0),
+#if QT_CONFIG(quick_shadereffect)
+  layer(0),
+#endif
   effectRefCount(0), hideRefCount(0),
   opacityNode(0), clipNode(0), rootNode(0),
   acceptedMouseButtons(0), origin(QQuickItem::Center),
@@ -8210,6 +8298,37 @@ QAccessible::Role QQuickItemPrivate::accessibleRole() const
 }
 #endif
 
+// helper code to let a visual parent mark its visual children for the garbage collector
+
+namespace QV4 {
+namespace Heap {
+struct QQuickItemWrapper : public QObjectWrapper {
+};
+}
+}
+
+struct QQuickItemWrapper : public QV4::QObjectWrapper {
+    V4_OBJECT2(QQuickItemWrapper, QV4::QObjectWrapper)
+    static void markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine *e);
+};
+
+DEFINE_OBJECT_VTABLE(QQuickItemWrapper);
+
+void QQuickItemWrapper::markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine *e)
+{
+    QObjectWrapper::Data *This = static_cast<QObjectWrapper::Data *>(that);
+    if (QQuickItem *item = static_cast<QQuickItem*>(This->object())) {
+        foreach (QQuickItem *child, QQuickItemPrivate::get(item)->childItems)
+            QV4::QObjectWrapper::markWrapper(child, e);
+    }
+    QV4::QObjectWrapper::markObjects(that, e);
+}
+
+quint64 QQuickItemPrivate::_q_createJSWrapper(QV4::ExecutionEngine *engine)
+{
+    return (engine->memoryManager->allocObject<QQuickItemWrapper>(q_func()))->asReturnedValue();
+}
+
 QT_END_NAMESPACE
 
 #include <moc_qquickitem.cpp>
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index 87ae83246c..b1b1d627b1 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -148,6 +148,7 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus
     Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickItemLayer *layer READ layer DESIGNABLE false CONSTANT FINAL)
 
     Q_CLASSINFO("DefaultProperty", "data")
+    Q_CLASSINFO("qt_QmlJSWrapperFactoryMethod", "_q_createJSWrapper(QV4::ExecutionEngine*)")
 
 public:
     enum Flag {
@@ -319,12 +320,12 @@ public:
     QTransform itemTransform(QQuickItem *, bool *) const;
     QPointF mapToItem(const QQuickItem *item, const QPointF &point) const;
     QPointF mapToScene(const QPointF &point) const;
-    Q_REVISION(7) Q_INVOKABLE QPointF mapToGlobal(const QPointF &point) const;
+    QPointF mapToGlobal(const QPointF &point) const;
     QRectF mapRectToItem(const QQuickItem *item, const QRectF &rect) const;
     QRectF mapRectToScene(const QRectF &rect) const;
     QPointF mapFromItem(const QQuickItem *item, const QPointF &point) const;
     QPointF mapFromScene(const QPointF &point) const;
-    Q_REVISION(7) Q_INVOKABLE QPointF mapFromGlobal(const QPointF &point) const;
+    QPointF mapFromGlobal(const QPointF &point) const;
     QRectF mapRectFromItem(const QQuickItem *item, const QRectF &rect) const;
     QRectF mapRectFromScene(const QRectF &rect) const;
 
@@ -332,6 +333,8 @@ public:
 
     Q_INVOKABLE void mapFromItem(QQmlV4Function*) const;
     Q_INVOKABLE void mapToItem(QQmlV4Function*) const;
+    Q_REVISION(7) Q_INVOKABLE void mapFromGlobal(QQmlV4Function*) const;
+    Q_REVISION(7) Q_INVOKABLE void mapToGlobal(QQmlV4Function*) const;
     Q_INVOKABLE void forceActiveFocus();
     Q_INVOKABLE void forceActiveFocus(Qt::FocusReason reason);
     Q_REVISION(1) Q_INVOKABLE QQuickItem *nextItemInFocusChain(bool forward = true);
@@ -442,6 +445,7 @@ protected:
 
 private:
     Q_PRIVATE_SLOT(d_func(), void _q_resourceObjectDeleted(QObject *))
+    Q_PRIVATE_SLOT(d_func(), quint64 _q_createJSWrapper(QV4::ExecutionEngine *))
 
     friend class QQuickWindow;
     friend class QQuickWindowPrivate;
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index 5fa6de546f..49d0949fb8 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -76,7 +76,9 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qelapsedtimer.h>
 
+#if QT_CONFIG(quick_shadereffect)
 #include <QtQuick/private/qquickshadereffectsource_p.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -136,6 +138,7 @@ public:
     QList<QQuickItem *> items;
 };
 
+#if QT_CONFIG(quick_shadereffect)
 
 class QQuickItemLayer : public QObject, public QQuickItemChangeListener
 {
@@ -237,6 +240,8 @@ private:
     QQuickShaderEffectSource::TextureMirroring m_textureMirroring;
 };
 
+#endif
+
 class Q_QUICK_PRIVATE_EXPORT QQuickItemPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QQuickItem)
@@ -301,6 +306,7 @@ public:
 
     void _q_resourceObjectDeleted(QObject *);
     void _q_windowChanged(QQuickWindow *w);
+    quint64 _q_createJSWrapper(QV4::ExecutionEngine *engine);
 
     enum ChangeType {
         Geometry = 0x01,
@@ -340,7 +346,9 @@ public:
         QQuickEnterKeyAttached *enterKeyAttached;
         QQuickItemKeyFilter *keyHandler;
         QVector<QQuickPointerHandler *> pointerHandlers;
+#if QT_CONFIG(quick_shadereffect)
         mutable QQuickItemLayer *layer;
+#endif
 #ifndef QT_NO_CURSOR
         QCursor cursor;
 #endif
@@ -597,9 +605,6 @@ public:
     void setHasCursorInChild(bool hasCursor);
     void setHasHoverInChild(bool hasHover);
 
-    // recursive helper to let a visual parent mark its visual children
-    void markObjects(QV4::ExecutionEngine *e);
-
     virtual void updatePolish() { }
 };
 
@@ -860,9 +865,9 @@ private:
     void inputMethodEvent(QInputMethodEvent *, bool post) Q_DECL_OVERRIDE;
     QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE;
 #endif
-    const QByteArray keyToSignal(int key);
+    static QByteArray keyToSignal(int key);
 
-    bool isConnected(const char *signalName);
+    bool isConnected(const char *signalName) const;
 };
 
 Qt::MouseButtons QQuickItemPrivate::acceptedMouseButtons() const
@@ -929,7 +934,9 @@ Q_DECLARE_TYPEINFO(QQuickItemPrivate::ChangeListener, Q_PRIMITIVE_TYPE);
 
 QT_END_NAMESPACE
 
+#if QT_CONFIG(quick_shadereffect)
 QML_DECLARE_TYPE(QQuickItemLayer)
+#endif
 QML_DECLARE_TYPE(QQuickKeysAttached)
 QML_DECLARE_TYPEINFO(QQuickKeysAttached, QML_HAS_ATTACHED_PROPERTIES)
 QML_DECLARE_TYPE(QQuickKeyNavigationAttached)
diff --git a/src/quick/items/qquickitemanimation.cpp b/src/quick/items/qquickitemanimation.cpp
index 5c0caf5ca2..fd4a7d733f 100644
--- a/src/quick/items/qquickitemanimation.cpp
+++ b/src/quick/items/qquickitemanimation.cpp
@@ -42,7 +42,9 @@
 #include "qquickstateoperations_p.h"
 
 #include <private/qqmlproperty_p.h>
+#if QT_CONFIG(quick_path)
 #include <private/qquickpath_p.h>
+#endif
 #include "private/qparallelanimationgroupjob_p.h"
 #include "private/qsequentialanimationgroupjob_p.h"
 
@@ -554,6 +556,8 @@ QAbstractAnimationJob* QQuickAnchorAnimation::transition(QQuickStateActions &act
     return initInstance(animator);
 }
 
+
+#if QT_CONFIG(quick_path)
 /*!
     \qmltype PathAnimation
     \instantiates QQuickPathAnimation
@@ -1044,4 +1048,6 @@ QQuickPathAnimationAnimator::~QQuickPathAnimationAnimator()
     }
 }
 
+#endif // quick_path
+
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickitemanimation_p.h b/src/quick/items/qquickitemanimation_p.h
index df80272eaa..a503cff223 100644
--- a/src/quick/items/qquickitemanimation_p.h
+++ b/src/quick/items/qquickitemanimation_p.h
@@ -124,6 +124,8 @@ protected:
                             QObject *defaultTarget = 0) Q_DECL_OVERRIDE;
 };
 
+#if QT_CONFIG(quick_path)
+
 class QQuickItem;
 class QQuickPath;
 class QQuickPathAnimationPrivate;
@@ -199,10 +201,14 @@ Q_SIGNALS:
     void endRotationChanged(qreal);
 };
 
+#endif
+
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPE(QQuickParentAnimation)
 QML_DECLARE_TYPE(QQuickAnchorAnimation)
+#if QT_CONFIG(quick_path)
 QML_DECLARE_TYPE(QQuickPathAnimation)
+#endif
 
 #endif // QQUICKITEMANIMATION_H
diff --git a/src/quick/items/qquickitemanimation_p_p.h b/src/quick/items/qquickitemanimation_p_p.h
index 5b18e4b0ae..2d075dfab3 100644
--- a/src/quick/items/qquickitemanimation_p_p.h
+++ b/src/quick/items/qquickitemanimation_p_p.h
@@ -53,7 +53,9 @@
 
 #include "qquickitemanimation_p.h"
 
+#if QT_CONFIG(quick_path)
 #include <private/qquickpath_p.h>
+#endif
 #include <private/qquickanimation_p_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -84,6 +86,8 @@ public:
     QList<QQuickItem*> targets;
 };
 
+#if QT_CONFIG(quick_path)
+
 class QQuickPathAnimationUpdater : public QQuickBulkValueUpdater
 {
 public:
@@ -93,7 +97,7 @@ public:
         entryInterval(0), exitInterval(0) {}
     ~QQuickPathAnimationUpdater() {}
 
-    void setValue(qreal v);
+    void setValue(qreal v) override;
 
     QQuickPath *path;
 
@@ -129,7 +133,7 @@ public:
 
     void clearTemplate() { animationTemplate = 0; }
 
-    QQuickPathAnimationUpdater *pathUpdater() { return static_cast<QQuickPathAnimationUpdater*>(getAnimValue()); }
+    QQuickPathAnimationUpdater *pathUpdater() const { return static_cast<QQuickPathAnimationUpdater*>(getAnimValue()); }
 private:
     QQuickPathAnimationPrivate *animationTemplate;
 };
@@ -153,6 +157,7 @@ public:
     QHash<QQuickItem*, QQuickPathAnimationAnimator* > activeAnimations;
 };
 
+#endif
 
 QT_END_NAMESPACE
 
diff --git a/src/quick/items/qquickitemgrabresult.cpp b/src/quick/items/qquickitemgrabresult.cpp
index 0db5323863..c6355ceed2 100644
--- a/src/quick/items/qquickitemgrabresult.cpp
+++ b/src/quick/items/qquickitemgrabresult.cpp
@@ -37,17 +37,21 @@
 **
 ****************************************************************************/
 
+#include <private/qtquickglobal_p.h>
 #include "qquickitemgrabresult.h"
 
 #include "qquickwindow.h"
 #include "qquickitem.h"
+#if QT_CONFIG(quick_shadereffect)
 #include "qquickshadereffectsource_p.h"
+#endif
 
 #include <QtQml/QQmlEngine>
 
 #include <private/qquickpixmapcache_p.h>
 #include <private/qquickitem_p.h>
 #include <private/qsgcontext_p.h>
+#include <private/qsgadaptationlayer_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -180,13 +184,26 @@ QQuickItemGrabResult::QQuickItemGrabResult(QObject *parent)
 /*!
  * Saves the grab result as an image to \a fileName. Returns true
  * if successful; otherwise returns false.
+ *
+ * \note In Qt versions prior to 5.9, this function is marked as non-\c{const}.
  */
-bool QQuickItemGrabResult::saveToFile(const QString &fileName)
+bool QQuickItemGrabResult::saveToFile(const QString &fileName) const
 {
-    Q_D(QQuickItemGrabResult);
+    Q_D(const QQuickItemGrabResult);
     return d->image.save(fileName);
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+/*!
+ * \overload
+ * \internal
+ */
+bool QQuickItemGrabResult::saveToFile(const QString &fileName)
+{
+    return qAsConst(*this).saveToFile(fileName);
+}
+#endif // < Qt 6
+
 QUrl QQuickItemGrabResult::url() const
 {
     Q_D(const QQuickItemGrabResult);
diff --git a/src/quick/items/qquickitemgrabresult.h b/src/quick/items/qquickitemgrabresult.h
index 42d71862de..30f8f0c2ef 100644
--- a/src/quick/items/qquickitemgrabresult.h
+++ b/src/quick/items/qquickitemgrabresult.h
@@ -64,10 +64,13 @@ public:
     QImage image() const;
     QUrl url() const;
 
-    Q_INVOKABLE bool saveToFile(const QString &fileName);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    Q_INVOKABLE bool saveToFile(const QString &fileName); // ### Qt 6: remove
+#endif
+    Q_INVOKABLE bool saveToFile(const QString &fileName) const;
 
 protected:
-    bool event(QEvent *);
+    bool event(QEvent *) override;
 
 Q_SIGNALS:
     void ready();
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index 1bc1aebe4f..0705d9b504 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -55,34 +55,56 @@
 #include "qquickpincharea_p.h"
 #include "qquickflickable_p.h"
 #include "qquickflickable_p_p.h"
+#if QT_CONFIG(quick_listview)
 #include "qquicklistview_p.h"
+#endif
+#if QT_CONFIG(quick_gridview)
 #include "qquickgridview_p.h"
+#endif
+#if QT_CONFIG(quick_pathview)
 #include "qquickpathview_p.h"
+#endif
+#if QT_CONFIG(quick_viewtransitions)
 #include "qquickitemviewtransition_p.h"
+#endif
+#if QT_CONFIG(quick_path)
 #include <private/qquickpath_p.h>
 #include <private/qquickpathinterpolator_p.h>
+#endif
+#if QT_CONFIG(quick_positioners)
 #include "qquickpositioners_p.h"
+#endif
 #include "qquickrepeater_p.h"
 #include "qquickloader_p.h"
+#if QT_CONFIG(quick_animatedimage)
 #include "qquickanimatedimage_p.h"
+#endif
+#if QT_CONFIG(quick_flipable)
 #include "qquickflipable_p.h"
+#endif
 #include "qquicktranslate_p.h"
 #include "qquickstateoperations_p.h"
 #include "qquickitemanimation_p.h"
-#include <QtQuick/private/qquickshadereffectsource_p.h>
 //#include <private/qquickpincharea_p.h>
+#if QT_CONFIG(quick_canvas)
 #include <QtQuick/private/qquickcanvasitem_p.h>
 #include <QtQuick/private/qquickcontext2d_p.h>
+#endif
 #include "qquickitemgrabresult.h"
+#if QT_CONFIG(quick_sprite)
 #include "qquicksprite_p.h"
 #include "qquickspritesequence_p.h"
 #include "qquickanimatedsprite_p.h"
+#endif
 #ifndef QT_NO_OPENGL
 # include "qquickopenglinfo_p.h"
 #endif
 #include "qquickgraphicsinfo_p.h"
+#if QT_CONFIG(quick_shadereffect)
+#include <QtQuick/private/qquickshadereffectsource_p.h>
 #include "qquickshadereffect_p.h"
 #include "qquickshadereffectmesh_p.h"
+#endif
 #include "qquickdrag_p.h"
 #include "qquickdroparea_p.h"
 #include "qquickmultipointtoucharea_p.h"
@@ -134,27 +156,40 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     QQmlPrivate::RegisterAutoParent autoparent = { 0, &qquickitem_autoParent };
     QQmlPrivate::qmlregister(QQmlPrivate::AutoParentRegistration, &autoparent);
 
-#ifdef QT_NO_MOVIE
+#if !QT_CONFIG(quick_animatedimage)
     qmlRegisterTypeNotAvailable(uri,major,minor,"AnimatedImage", QCoreApplication::translate("QQuickAnimatedImage","Qt was built without support for QMovie"));
 #else
     qmlRegisterType<QQuickAnimatedImage>(uri,major,minor,"AnimatedImage");
 #endif
     qmlRegisterType<QQuickBorderImage>(uri,major,minor,"BorderImage");
-    qmlRegisterType<QQuickColumn>(uri,major,minor,"Column");
     qmlRegisterType<QQuickFlickable>(uri,major,minor,"Flickable");
+#if QT_CONFIG(quick_flipable)
     qmlRegisterType<QQuickFlipable>(uri,major,minor,"Flipable");
-    qmlRegisterType<QQuickFlow>(uri,major,minor,"Flow");
+#endif
 //    qmlRegisterType<QQuickFocusPanel>(uri,major,minor,"FocusPanel");
     qmlRegisterType<QQuickFocusScope>(uri,major,minor,"FocusScope");
     qmlRegisterType<QQuickGradient>(uri,major,minor,"Gradient");
     qmlRegisterType<QQuickGradientStop>(uri,major,minor,"GradientStop");
+#if QT_CONFIG(quick_positioners)
+    qmlRegisterType<QQuickColumn>(uri,major,minor,"Column");
+    qmlRegisterType<QQuickFlow>(uri,major,minor,"Flow");
     qmlRegisterType<QQuickGrid>(uri,major,minor,"Grid");
+    qmlRegisterUncreatableType<QQuickBasePositioner>(uri,major,minor,"Positioner",
+                                                  QStringLiteral("Positioner is an abstract type that is only available as an attached property."));
+    qmlRegisterType<QQuickRow>(uri,major,minor,"Row");
+#endif
+#if QT_CONFIG(quick_gridview)
     qmlRegisterType<QQuickGridView>(uri,major,minor,"GridView");
+#endif
     qmlRegisterType<QQuickImage>(uri,major,minor,"Image");
     qmlRegisterType<QQuickItem>(uri,major,minor,"Item");
+#if QT_CONFIG(quick_listview)
     qmlRegisterType<QQuickListView>(uri,major,minor,"ListView");
+    qmlRegisterType<QQuickViewSection>(uri,major,minor,"ViewSection");
+#endif
     qmlRegisterType<QQuickLoader>(uri,major,minor,"Loader");
     qmlRegisterType<QQuickMouseArea>(uri,major,minor,"MouseArea");
+#if QT_CONFIG(quick_path)
     qmlRegisterType<QQuickPath>(uri,major,minor,"Path");
     qmlRegisterType<QQuickPathAttribute>(uri,major,minor,"PathAttribute");
     qmlRegisterType<QQuickPathCubic>(uri,major,minor,"PathCubic");
@@ -164,12 +199,12 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickPathCatmullRomCurve>("QtQuick",2,0,"PathCurve");
     qmlRegisterType<QQuickPathArc>("QtQuick",2,0,"PathArc");
     qmlRegisterType<QQuickPathSvg>("QtQuick",2,0,"PathSvg");
+#endif
+#if QT_CONFIG(quick_pathview)
     qmlRegisterType<QQuickPathView>(uri,major,minor,"PathView");
-    qmlRegisterUncreatableType<QQuickBasePositioner>(uri,major,minor,"Positioner",
-                                                  QStringLiteral("Positioner is an abstract type that is only available as an attached property."));
+#endif
     qmlRegisterType<QQuickRectangle>(uri,major,minor,"Rectangle");
     qmlRegisterType<QQuickRepeater>(uri,major,minor,"Repeater");
-    qmlRegisterType<QQuickRow>(uri,major,minor,"Row");
     qmlRegisterType<QQuickTranslate>(uri,major,minor,"Translate");
     qmlRegisterType<QQuickRotation>(uri,major,minor,"Rotation");
     qmlRegisterType<QQuickScale>(uri,major,minor,"Scale");
@@ -180,17 +215,20 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickTextInput>(uri,major,minor,"TextInput");
     qmlRegisterType<QQuickTextInput,2>(uri,2,2,"TextInput");
     qmlRegisterType<QQuickTextInput,3>(uri,2,4,"TextInput");
-    qmlRegisterType<QQuickViewSection>(uri,major,minor,"ViewSection");
     qmlRegisterType<QQuickItemGrabResult>();
+#if QT_CONFIG(quick_shadereffect)
     qmlRegisterType<QQuickItemLayer>();
+#endif
     qmlRegisterType<QQuickAnchors>();
     qmlRegisterType<QQuickKeyEvent>();
     qmlRegisterType<QQuickMouseEvent>();
     qmlRegisterType<QQuickWheelEvent>();
     qmlRegisterType<QQuickCloseEvent>();
     qmlRegisterType<QQuickTransform>();
+#if QT_CONFIG(quick_path)
     qmlRegisterType<QQuickPathElement>();
     qmlRegisterType<QQuickCurve>();
+#endif
     qmlRegisterType<QQuickScaleGrid>();
     qmlRegisterType<QQuickTextLine>();
     qmlRegisterType<QQuickPen>();
@@ -203,32 +241,42 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterUncreatableType<QQuickKeyNavigationAttached>(uri,major,minor,"KeyNavigation",QQuickKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
     qmlRegisterUncreatableType<QQuickKeysAttached>(uri,major,minor,"Keys",QQuickKeysAttached::tr("Keys is only available via attached properties"));
     qmlRegisterUncreatableType<QQuickLayoutMirroringAttached>(uri,major,minor,"LayoutMirroring", QQuickLayoutMirroringAttached::tr("LayoutMirroring is only available via attached properties"));
+#if QT_CONFIG(quick_viewtransitions)
     qmlRegisterUncreatableType<QQuickViewTransitionAttached>(uri,major,minor,"ViewTransition",QQuickViewTransitionAttached::tr("ViewTransition is only available via attached properties"));
+#endif
 
     qmlRegisterType<QQuickPinchArea>(uri,major,minor,"PinchArea");
     qmlRegisterType<QQuickPinch>(uri,major,minor,"Pinch");
     qmlRegisterType<QQuickPinchEvent>();
 
+#if QT_CONFIG(quick_shadereffect)
     qmlRegisterType<QQuickShaderEffectSource>("QtQuick", 2, 0, "ShaderEffectSource");
     qmlRegisterUncreatableType<QQuickShaderEffectMesh>("QtQuick", 2, 0, "ShaderEffectMesh", QQuickShaderEffectMesh::tr("Cannot create instance of abstract class ShaderEffectMesh."));
     qmlRegisterType<QQuickGridMesh>("QtQuick", 2, 0, "GridMesh");
     qmlRegisterType<QQuickShaderEffect>("QtQuick", 2, 0, "ShaderEffect");
+#endif
 
     qmlRegisterUncreatableType<QQuickPaintedItem>("QtQuick", 2, 0, "PaintedItem", QQuickPaintedItem::tr("Cannot create instance of abstract class PaintedItem"));
 
+#if QT_CONFIG(quick_canvas)
     qmlRegisterType<QQuickCanvasItem>("QtQuick", 2, 0, "Canvas");
+#endif
 
+#if QT_CONFIG(quick_sprite)
     qmlRegisterType<QQuickSprite>("QtQuick", 2, 0, "Sprite");
     qmlRegisterType<QQuickAnimatedSprite>("QtQuick", 2, 0, "AnimatedSprite");
     qmlRegisterType<QQuickSpriteSequence>("QtQuick", 2, 0, "SpriteSequence");
+#endif
 
     qmlRegisterType<QQuickParentChange>(uri, major, minor,"ParentChange");
     qmlRegisterType<QQuickAnchorChanges>(uri, major, minor,"AnchorChanges");
     qmlRegisterType<QQuickAnchorSet>();
     qmlRegisterType<QQuickAnchorAnimation>(uri, major, minor,"AnchorAnimation");
     qmlRegisterType<QQuickParentAnimation>(uri, major, minor,"ParentAnimation");
+#if QT_CONFIG(quick_canvas)
     qmlRegisterType<QQuickPathAnimation>("QtQuick",2,0,"PathAnimation");
     qmlRegisterType<QQuickPathInterpolator>("QtQuick",2,0,"PathInterpolator");
+#endif
 
 #ifndef QT_NO_DRAGANDDROP
     qmlRegisterType<QQuickDropArea>("QtQuick", 2, 0, "DropArea");
@@ -246,11 +294,19 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
 #endif
 
     qmlRegisterType<QQuickItem, 1>(uri, 2, 1,"Item");
+#if QT_CONFIG(quick_positioners)
     qmlRegisterType<QQuickGrid, 1>(uri, 2, 1, "Grid");
+#endif
+#if QT_CONFIG(quick_itemview)
     qmlRegisterUncreatableType<QQuickItemView, 1>(uri, 2, 1, "ItemView", QQuickItemView::tr("ItemView is an abstract base class"));
     qmlRegisterUncreatableType<QQuickItemView, 2>(uri, 2, 3, "ItemView", QQuickItemView::tr("ItemView is an abstract base class"));
+#endif
+#if QT_CONFIG(quick_listview)
     qmlRegisterType<QQuickListView, 1>(uri, 2, 1, "ListView");
+#endif
+#if QT_CONFIG(quick_gridview)
     qmlRegisterType<QQuickGridView, 1>(uri, 2, 1, "GridView");
+#endif
     qmlRegisterType<QQuickTextEdit, 1>(uri, 2, 1, "TextEdit");
 
     qmlRegisterType<QQuickText, 2>(uri, 2, 2, "Text");
@@ -261,9 +317,13 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickImage, 1>(uri, 2, 3,"Image");
 
     qmlRegisterType<QQuickItem, 2>(uri, 2, 4, "Item");
+#if QT_CONFIG(quick_listview)
     qmlRegisterType<QQuickListView, 2>(uri, 2, 4, "ListView");
+#endif
     qmlRegisterType<QQuickMouseArea, 1>(uri, 2, 4, "MouseArea");
+#if QT_CONFIG(quick_shadereffect)
     qmlRegisterType<QQuickShaderEffect, 1>(uri, 2, 4, "ShaderEffect");
+#endif
 
 #ifndef QT_NO_OPENGL
     qmlRegisterUncreatableType<QQuickOpenGLInfo>(uri, 2, 4,"OpenGLInfo", QQuickOpenGLInfo::tr("OpenGLInfo is only available via attached properties"));
@@ -275,26 +335,39 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickText, 6>(uri, 2, 6, "Text");
     qmlRegisterType<QQuickTextEdit, 6>(uri, 2, 6, "TextEdit");
     qmlRegisterType<QQuickTextInput, 6>(uri, 2, 6, "TextInput");
+#if QT_CONFIG(quick_positioners)
     qmlRegisterUncreatableType<QQuickBasePositioner, 6>(uri, 2, 6, "Positioner",
                                                   QStringLiteral("Positioner is an abstract type that is only available as an attached property."));
     qmlRegisterType<QQuickColumn, 6>(uri, 2, 6, "Column");
     qmlRegisterType<QQuickRow, 6>(uri, 2, 6, "Row");
     qmlRegisterType<QQuickGrid, 6>(uri, 2, 6, "Grid");
     qmlRegisterType<QQuickFlow, 6>(uri, 2, 6, "Flow");
+#endif
     qmlRegisterUncreatableType<QQuickEnterKeyAttached, 6>(uri, 2, 6, "EnterKey",
                                                            QQuickEnterKeyAttached::tr("EnterKey is only available via attached properties"));
+#if QT_CONFIG(quick_shadereffect)
     qmlRegisterType<QQuickShaderEffectSource, 1>(uri, 2, 6, "ShaderEffectSource");
+#endif
 
+    qmlRegisterType<QQuickItem, 7>(uri, 2, 7, "Item");
+#if QT_CONFIG(quick_listview)
     qmlRegisterType<QQuickListView, 7>(uri, 2, 7, "ListView");
+#endif
+#if QT_CONFIG(quick_gridview)
     qmlRegisterType<QQuickGridView, 7>(uri, 2, 7, "GridView");
+#endif
     qmlRegisterType<QQuickTextInput, 7>(uri, 2, 7, "TextInput");
     qmlRegisterType<QQuickTextEdit, 7>(uri, 2, 7, "TextEdit");
+#if QT_CONFIG(quick_pathview)
     qmlRegisterType<QQuickPathView, 7>(uri, 2, 7, "PathView");
+#endif
 
     qmlRegisterUncreatableType<QQuickMouseEvent, 7>(uri, 2, 7, nullptr, QQuickMouseEvent::tr("MouseEvent is only available within handlers in MouseArea"));
 
     qmlRegisterUncreatableType<QQuickGraphicsInfo>(uri, 2, 8,"GraphicsInfo", QQuickGraphicsInfo::tr("GraphicsInfo is only available via attached properties"));
+#if QT_CONFIG(quick_shadereffect)
     qmlRegisterType<QQuickBorderImageMesh>("QtQuick", 2, 8, "BorderImageMesh");
+#endif
 }
 
 static void initResources()
diff --git a/src/quick/items/qquickitemview.cpp b/src/quick/items/qquickitemview.cpp
index e017d6564a..d02ed07de0 100644
--- a/src/quick/items/qquickitemview.cpp
+++ b/src/quick/items/qquickitemview.cpp
@@ -935,9 +935,11 @@ void QQuickItemViewPrivate::positionViewAtIndex(int index, int mode)
         return;
 
     applyPendingChanges();
-    int idx = qMax(qMin(index, model->count()-1), 0);
+    const int modelCount = model->count();
+    int idx = qMax(qMin(index, modelCount - 1), 0);
 
-    qreal pos = isContentFlowReversed() ? -position() - size() : position();
+    const auto viewSize = size();
+    qreal pos = isContentFlowReversed() ? -position() - viewSize : position();
     FxViewItem *item = visibleItem(idx);
     qreal maxExtent = calculatedMaxExtent();
     if (!item) {
@@ -961,22 +963,22 @@ void QQuickItemViewPrivate::positionViewAtIndex(int index, int mode)
                 pos -= headerSize();
             break;
         case QQuickItemView::Center:
-            pos = itemPos - (size() - item->size())/2;
+            pos = itemPos - (viewSize - item->size())/2;
             break;
         case QQuickItemView::End:
-            pos = itemPos - size() + item->size();
-            if (footer && (index >= model->count() || hasStickyFooter()))
+            pos = itemPos - viewSize + item->size();
+            if (footer && (index >= modelCount || hasStickyFooter()))
                 pos += footerSize();
             break;
         case QQuickItemView::Visible:
-            if (itemPos > pos + size())
-                pos = itemPos - size() + item->size();
+            if (itemPos > pos + viewSize)
+                pos = itemPos - viewSize + item->size();
             else if (item->endPosition() <= pos)
                 pos = itemPos;
             break;
         case QQuickItemView::Contain:
-            if (item->endPosition() >= pos + size())
-                pos = itemPos - size() + item->size();
+            if (item->endPosition() >= pos + viewSize)
+                pos = itemPos - viewSize + item->size();
             if (itemPos < pos)
                 pos = itemPos;
             break;
@@ -1025,28 +1027,27 @@ void QQuickItemView::positionViewAtEnd()
     d->positionViewAtIndex(d->model->count(), End);
 }
 
-int QQuickItemView::indexAt(qreal x, qreal y) const
+static FxViewItem * fxViewItemAtPosition(const QList<FxViewItem *> &items, qreal x, qreal y)
 {
-    Q_D(const QQuickItemView);
-    for (int i = 0; i < d->visibleItems.count(); ++i) {
-        const FxViewItem *item = d->visibleItems.at(i);
+    for (FxViewItem *item : items) {
         if (item->contains(x, y))
-            return item->index;
+            return item;
     }
+    return nullptr;
+}
 
-    return -1;
+int QQuickItemView::indexAt(qreal x, qreal y) const
+{
+    Q_D(const QQuickItemView);
+    const FxViewItem *item = fxViewItemAtPosition(d->visibleItems, x, y);
+    return item ? item->index : -1;
 }
 
 QQuickItem *QQuickItemView::itemAt(qreal x, qreal y) const
 {
     Q_D(const QQuickItemView);
-    for (int i = 0; i < d->visibleItems.count(); ++i) {
-        const FxViewItem *item = d->visibleItems.at(i);
-        if (item->contains(x, y))
-            return item->item;
-    }
-
-    return 0;
+    const FxViewItem *item = fxViewItemAtPosition(d->visibleItems, x, y);
+    return item ? item->item : nullptr;
 }
 
 void QQuickItemView::forceLayout()
@@ -1787,10 +1788,11 @@ void QQuickItemViewPrivate::animationFinished(QAbstractAnimationJob *)
 void QQuickItemViewPrivate::refill()
 {
     qreal s = qMax(size(), qreal(0.));
+    const auto pos = position();
     if (isContentFlowReversed())
-        refill(-position()-displayMarginBeginning-s, -position()+displayMarginEnd);
+        refill(-pos - displayMarginBeginning-s, -pos + displayMarginEnd);
     else
-        refill(position()-displayMarginBeginning, position()+displayMarginEnd+s);
+        refill(pos - displayMarginBeginning, pos + displayMarginEnd+s);
 }
 
 void QQuickItemViewPrivate::refill(qreal from, qreal to)
@@ -2428,14 +2430,14 @@ bool QQuickItemViewPrivate::releaseItem(FxViewItem *item)
     return flags != QQmlInstanceModel::Referenced;
 }
 
-QQuickItem *QQuickItemViewPrivate::createHighlightItem()
+QQuickItem *QQuickItemViewPrivate::createHighlightItem() const
 {
     return createComponentItem(highlightComponent, 0.0, true);
 }
 
-QQuickItem *QQuickItemViewPrivate::createComponentItem(QQmlComponent *component, qreal zValue, bool createDefault)
+QQuickItem *QQuickItemViewPrivate::createComponentItem(QQmlComponent *component, qreal zValue, bool createDefault) const
 {
-    Q_Q(QQuickItemView);
+    Q_Q(const QQuickItemView);
 
     QQuickItem *item = 0;
     if (component) {
diff --git a/src/quick/items/qquickitemview_p.h b/src/quick/items/qquickitemview_p.h
index 1a28fc212b..3ac54ea3dc 100644
--- a/src/quick/items/qquickitemview_p.h
+++ b/src/quick/items/qquickitemview_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <QtQuick/private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_itemview);
+
 #include "qquickflickable_p.h"
 #include <qpointer.h>
 #include <QtCore/QLoggingCategory>
@@ -312,7 +316,7 @@ public:
         : QObject(parent), m_isCurrent(false), m_delayRemove(false) {}
     ~QQuickItemViewAttached() {}
 
-    QQuickItemView *view() { return m_view; }
+    QQuickItemView *view() const { return m_view; }
     void setView(QQuickItemView *view) {
         if (view != m_view) {
             m_view = view;
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h
index 0893d6e749..a8e66301c1 100644
--- a/src/quick/items/qquickitemview_p_p.h
+++ b/src/quick/items/qquickitemview_p_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <QtQuick/private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_itemview);
+
 #include "qquickitemview_p.h"
 #include "qquickitemviewtransition_p.h"
 #include "qquickflickable_p_p.h"
@@ -205,8 +209,8 @@ public:
     FxViewItem *createItem(int modelIndex, bool asynchronous = false);
     virtual bool releaseItem(FxViewItem *item);
 
-    QQuickItem *createHighlightItem();
-    QQuickItem *createComponentItem(QQmlComponent *component, qreal zValue, bool createDefault = false);
+    QQuickItem *createHighlightItem() const;
+    QQuickItem *createComponentItem(QQmlComponent *component, qreal zValue, bool createDefault = false) const;
 
     void updateCurrent(int modelIndex);
     void updateTrackedItem();
diff --git a/src/quick/items/qquickitemviewtransition.cpp b/src/quick/items/qquickitemviewtransition.cpp
index 6d2421c3df..83c451613e 100644
--- a/src/quick/items/qquickitemviewtransition.cpp
+++ b/src/quick/items/qquickitemviewtransition.cpp
@@ -246,7 +246,7 @@ void QQuickItemViewTransitioner::resetTargetLists()
     moveTransitionTargets.clear();
 }
 
-QQuickTransition *QQuickItemViewTransitioner::transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget)
+QQuickTransition *QQuickItemViewTransitioner::transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget) const
 {
     if (type == QQuickItemViewTransitioner::NoTransition)
         return 0;
diff --git a/src/quick/items/qquickitemviewtransition_p.h b/src/quick/items/qquickitemviewtransition_p.h
index 6641dada29..3d2f5361b1 100644
--- a/src/quick/items/qquickitemviewtransition_p.h
+++ b/src/quick/items/qquickitemviewtransition_p.h
@@ -52,6 +52,9 @@
 //
 
 #include <QtQuick/private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_viewtransitions);
+
 #include <QtCore/qobject.h>
 #include <QtCore/qpoint.h>
 #include <QtQml/qqml.h>
@@ -94,7 +97,7 @@ public:
     void addToTargetLists(QQuickItemViewTransitioner::TransitionType type, QQuickItemViewTransitionableItem *item, int index);
     void resetTargetLists();
 
-    QQuickTransition *transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget);
+    QQuickTransition *transitionObject(QQuickItemViewTransitioner::TransitionType type, bool asTarget) const;
     const QList<int> &targetIndexes(QQuickItemViewTransitioner::TransitionType type) const;
     const QList<QObject *> &targetItems(QQuickItemViewTransitioner::TransitionType type) const;
 
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 47efecdb2d..30625c7ea8 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -1765,7 +1765,7 @@ bool QQuickListViewPrivate::flick(AxisData &data, qreal minExtent, qreal maxExte
     State should \e never be stored in a delegate.
 
     ListView attaches a number of properties to the root item of the delegate, for example
-    \c {ListView:isCurrentItem}.  In the following example, the root delegate item can access
+    \c ListView.isCurrentItem.  In the following example, the root delegate item can access
     this attached property directly as \c ListView.isCurrentItem, while the child
     \c contactInfo object must refer to this property as \c wrapper.ListView.isCurrentItem.
 
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h
index 5a5e8a55fe..3a871e88e9 100644
--- a/src/quick/items/qquicklistview_p.h
+++ b/src/quick/items/qquicklistview_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_listview);
+
 #include "qquickitemview_p.h"
 
 #include <private/qtquickglobal_p.h>
@@ -84,7 +88,7 @@ public:
 
     enum LabelPositioning { InlineLabels = 0x01, CurrentLabelAtStart = 0x02, NextLabelAtEnd = 0x04 };
     Q_ENUM(LabelPositioning)
-    int labelPositioning() { return m_labelPositioning; }
+    int labelPositioning() const { return m_labelPositioning; }
     void setLabelPositioning(int pos);
 
 Q_SIGNALS:
diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h
index fcccbfe4f5..a0a9ca0601 100644
--- a/src/quick/items/qquickloader_p_p.h
+++ b/src/quick/items/qquickloader_p_p.h
@@ -94,7 +94,7 @@ public:
     void incubatorStateChanged(QQmlIncubator::Status status);
     void setInitialState(QObject *o);
     void disposeInitialPropertyValues();
-    QUrl resolveSourceUrl(QQmlV4Function *args);
+    static QUrl resolveSourceUrl(QQmlV4Function *args);
     QV4::ReturnedValue extractInitialPropertyValues(QQmlV4Function *args, QObject *loader, bool *error);
 
     qreal getImplicitWidth() const Q_DECL_OVERRIDE;
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp
index 0118d882af..6bd83dd808 100644
--- a/src/quick/items/qquickmousearea.cpp
+++ b/src/quick/items/qquickmousearea.cpp
@@ -43,6 +43,7 @@
 #include "qquickdrag_p.h"
 
 #include <private/qqmldata_p.h>
+#include <private/qsgadaptationlayer_p.h>
 
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/qevent.h>
@@ -672,6 +673,7 @@ void QQuickMouseArea::mousePressEvent(QMouseEvent *event)
     Q_D(QQuickMouseArea);
     d->moved = false;
     d->stealMouse = d->preventStealing;
+    d->overThreshold = false;
     if (!d->enabled || !(event->button() & acceptedMouseButtons())) {
         QQuickItem::mousePressEvent(event);
     } else {
@@ -957,6 +959,7 @@ bool QQuickMouseArea::sendMouseEvent(QMouseEvent *event)
             if (!d->pressed) {
                 // no other buttons are pressed
                 d->stealMouse = false;
+                d->overThreshold = false;
                 if (c && c->mouseGrabberItem() == this)
                     ungrabMouse();
                 emit canceled();
diff --git a/src/quick/items/qquickopenglshadereffect.cpp b/src/quick/items/qquickopenglshadereffect.cpp
index b974641cca..42fcee3c0d 100644
--- a/src/quick/items/qquickopenglshadereffect.cpp
+++ b/src/quick/items/qquickopenglshadereffect.cpp
@@ -284,14 +284,14 @@ void QQuickOpenGLShaderEffectCommon::updateParseLog(bool ignoreAttributes)
     parseLog.clear();
     if (!ignoreAttributes) {
         if (!attributes.contains(qtPositionAttributeName())) {
-            parseLog += QLatin1String("Warning: Missing reference to \'");
-            parseLog += QLatin1String(qtPositionAttributeName());
-            parseLog += QLatin1String("\'.\n");
+            parseLog += QLatin1String("Warning: Missing reference to \'")
+                        + QLatin1String(qtPositionAttributeName())
+                        + QLatin1String("\'.\n");
         }
         if (!attributes.contains(qtTexCoordAttributeName())) {
-            parseLog += QLatin1String("Warning: Missing reference to \'");
-            parseLog += QLatin1String(qtTexCoordAttributeName());
-            parseLog += QLatin1String("\'.\n");
+            parseLog += QLatin1String("Warning: Missing reference to \'")
+                        + QLatin1String(qtTexCoordAttributeName())
+                        + QLatin1String("\'.\n");
         }
     }
     bool respectsMatrix = false;
@@ -918,9 +918,7 @@ QSGNode *QQuickOpenGLShaderEffect::handleUpdatePaintNode(QSGNode *oldNode, QQuic
         if (!mesh->validateAttributes(m_common.attributes, &posIndex)) {
             QString log = mesh->log();
             if (!log.isNull()) {
-                m_log = parseLog();
-                m_log += QLatin1String("*** Mesh ***\n");
-                m_log += log;
+                m_log = parseLog() + QLatin1String("*** Mesh ***\n") + log;
                 m_status = QQuickShaderEffect::Error;
                 emit m_item->logChanged();
                 emit m_item->statusChanged();
diff --git a/src/quick/items/qquickopenglshadereffect_p.h b/src/quick/items/qquickopenglshadereffect_p.h
index ed56a76409..64e79a9343 100644
--- a/src/quick/items/qquickopenglshadereffect_p.h
+++ b/src/quick/items/qquickopenglshadereffect_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_shadereffect);
+
 #include <QtQuick/qquickitem.h>
 
 #include <QtQuick/qsgmaterial.h>
diff --git a/src/quick/items/qquickopenglshadereffectnode.cpp b/src/quick/items/qquickopenglshadereffectnode.cpp
index 02b76b2dbc..e01ecc59e3 100644
--- a/src/quick/items/qquickopenglshadereffectnode.cpp
+++ b/src/quick/items/qquickopenglshadereffectnode.cpp
@@ -261,13 +261,11 @@ void QQuickCustomMaterialShader::compile()
     m_log.clear();
     m_compiled = true;
     if (!program()->addShaderFromSourceCode(QOpenGLShader::Vertex, vertexShader())) {
-        m_log += QLatin1String("*** Vertex shader ***\n");
-        m_log += program()->log();
+        m_log += QLatin1String("*** Vertex shader ***\n") + program()->log();
         m_compiled = false;
     }
     if (!program()->addShaderFromSourceCode(QOpenGLShader::Fragment, fragmentShader())) {
-        m_log += QLatin1String("*** Fragment shader ***\n");
-        m_log += program()->log();
+        m_log += QLatin1String("*** Fragment shader ***\n") + program()->log();
         m_compiled = false;
     }
 
diff --git a/src/quick/items/qquickopenglshadereffectnode_p.h b/src/quick/items/qquickopenglshadereffectnode_p.h
index 5abe3ae3d0..aea28e6612 100644
--- a/src/quick/items/qquickopenglshadereffectnode_p.h
+++ b/src/quick/items/qquickopenglshadereffectnode_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_shadereffect);
+
 #include <QtQuick/qsgnode.h>
 #include <QtQuick/qsgmaterial.h>
 #include <QtQuick/qsgtextureprovider.h>
diff --git a/src/quick/items/qquickpainteditem.cpp b/src/quick/items/qquickpainteditem.cpp
index d21eb93dbf..e565fceab8 100644
--- a/src/quick/items/qquickpainteditem.cpp
+++ b/src/quick/items/qquickpainteditem.cpp
@@ -43,6 +43,7 @@
 #include <QtQuick/private/qsgdefaultpainternode_p.h>
 #include <QtQuick/private/qsgcontext_p.h>
 #include <private/qsgadaptationlayer_p.h>
+#include <qsgtextureprovider.h>
 
 #include <qmath.h>
 
@@ -52,7 +53,7 @@ class QQuickPaintedItemTextureProvider : public QSGTextureProvider
 {
 public:
     QSGPainterNode *node;
-    QSGTexture *texture() const { return node ? node->texture() : 0; }
+    QSGTexture *texture() const override { return node ? node->texture() : 0; }
     void fireTextureChanged() { emit textureChanged(); }
 };
 
diff --git a/src/quick/items/qquickpathview.cpp b/src/quick/items/qquickpathview.cpp
index e54ee66fe5..11881ae0ab 100644
--- a/src/quick/items/qquickpathview.cpp
+++ b/src/quick/items/qquickpathview.cpp
@@ -63,13 +63,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcItemViewDelegateLifecycle)
 
 const qreal MinimumFlickVelocity = 75.0;
 
-inline qreal qmlMod(qreal x, qreal y)
-{
-    using std::fmod;
-    return fmod(x, y);
-}
-
-static QQmlOpenMetaObjectType *qPathViewAttachedType = 0;
+static QQmlOpenMetaObjectType *qPathViewAttachedType = nullptr;
 
 QQuickPathViewAttached::QQuickPathViewAttached(QObject *parent)
 : QObject(parent), m_percent(-1), m_view(0), m_onPath(false), m_isCurrent(false)
@@ -96,7 +90,7 @@ void QQuickPathViewAttached::setValue(const QByteArray &name, const QVariant &va
 }
 
 QQuickPathViewPrivate::QQuickPathViewPrivate()
-  : path(0), currentIndex(0), currentItemOffset(0.0), startPc(0)
+  : path(nullptr), currentIndex(0), currentItemOffset(0.0), startPc(0)
     , offset(0.0), offsetAdj(0.0), mappedRange(1.0), mappedCache(0.0)
     , stealMouse(false), ownModel(false), interactive(true), haveHighlightRange(true)
     , autoHighlight(true), highlightUp(false), layoutScheduled(false)
@@ -106,7 +100,7 @@ QQuickPathViewPrivate::QQuickPathViewPrivate()
     , moveOffset(this, &QQuickPathViewPrivate::setAdjustedOffset), flickDuration(0)
     , pathItems(-1), requestedIndex(-1), cacheSize(0), requestedZ(0)
     , moveReason(Other), movementDirection(QQuickPathView::Shortest), moveDirection(QQuickPathView::Shortest)
-    , attType(0), highlightComponent(0), highlightItem(0)
+    , attType(nullptr), highlightComponent(nullptr), highlightItem(nullptr)
     , moveHighlight(this, &QQuickPathViewPrivate::setHighlightPosition)
     , highlightPosition(0)
     , highlightRangeStart(0), highlightRangeEnd(0)
@@ -163,7 +157,7 @@ void QQuickPathView::createdItem(int index, QObject *object)
     if (d->requestedIndex != index) {
         qPathViewAttachedType = d->attachedType();
         QQuickPathViewAttached *att = static_cast<QQuickPathViewAttached *>(qmlAttachedPropertiesObject<QQuickPathView>(item));
-        qPathViewAttachedType = 0;
+        qPathViewAttachedType = nullptr;
         if (att) {
             att->m_view = this;
             att->setOnPath(false);
@@ -186,7 +180,7 @@ void QQuickPathView::initItem(int index, QObject *object)
         item->setParentItem(this);
         qPathViewAttachedType = d->attachedType();
         QQuickPathViewAttached *att = static_cast<QQuickPathViewAttached *>(qmlAttachedPropertiesObject<QQuickPathView>(item));
-        qPathViewAttachedType = 0;
+        qPathViewAttachedType = nullptr;
         if (att) {
             att->m_view = this;
             qreal percent = d->positionOfIndex(index);
@@ -215,7 +209,7 @@ void QQuickPathViewPrivate::releaseItem(QQuickItem *item)
             att->setOnPath(false);
     } else if (flags & QQmlInstanceModel::Destroyed) {
         // but we still reference it
-        item->setParentItem(0);
+        item->setParentItem(nullptr);
     }
 }
 
@@ -244,7 +238,7 @@ void QQuickPathViewPrivate::clear()
 {
     if (currentItem) {
         releaseItem(currentItem);
-        currentItem = 0;
+        currentItem = nullptr;
     }
     for (QQuickItem *p : qAsConst(items))
         releaseItem(p);
@@ -280,13 +274,13 @@ qreal QQuickPathViewPrivate::positionOfIndex(qreal index) const
                                    || snapMode != QQuickPathView::NoSnap))
             start = highlightRangeStart;
         qreal globalPos = index + offset;
-        globalPos = qmlMod(globalPos, qreal(modelCount)) / modelCount;
+        globalPos = std::fmod(globalPos, qreal(modelCount)) / modelCount;
         if (pathItems != -1 && pathItems < modelCount) {
             globalPos += start / mappedRange;
-            globalPos = qmlMod(globalPos, 1.0);
+            globalPos = std::fmod(globalPos, qreal(1.0));
             pos = globalPos * mappedRange;
         } else {
-            pos = qmlMod(globalPos + start, 1.0);
+            pos = std::fmod(globalPos + start, qreal(1.0));
         }
     }
 
@@ -315,13 +309,13 @@ void QQuickPathViewPrivate::createHighlight()
 
     bool changed = false;
     if (highlightItem) {
-        highlightItem->setParentItem(0);
+        highlightItem->setParentItem(nullptr);
         highlightItem->deleteLater();
-        highlightItem = 0;
+        highlightItem = nullptr;
         changed = true;
     }
 
-    QQuickItem *item = 0;
+    QQuickItem *item = nullptr;
     if (highlightComponent) {
         QQmlContext *creationContext = highlightComponent->creationContext();
         QQmlContext *highlightContext = new QQmlContext(
@@ -397,7 +391,7 @@ void QQuickPathViewPrivate::setHighlightPosition(qreal pos)
 
         qreal range = qreal(modelCount);
         // calc normalized position of highlight relative to offset
-        qreal relativeHighlight = qmlMod(pos + offset, range) / range;
+        qreal relativeHighlight = std::fmod(pos + offset, range) / range;
 
         if (!highlightUp && relativeHighlight > end / mappedRange) {
             qreal diff = 1.0 - relativeHighlight;
@@ -636,7 +630,7 @@ void QQuickPathView::setModel(const QVariant &m)
 
     d->modelVariant = model;
     QObject *object = qvariant_cast<QObject*>(model);
-    QQmlInstanceModel *vim = 0;
+    QQmlInstanceModel *vim = nullptr;
     if (object && (vim = qobject_cast<QQmlInstanceModel *>(object))) {
         if (d->ownModel) {
             delete d->model;
@@ -716,7 +710,7 @@ void QQuickPathView::setPath(QQuickPath *path)
         d->clear();
         if (d->attType) {
             d->attType->release();
-            d->attType = 0;
+            d->attType = nullptr;
         }
         d->regenerate();
     }
@@ -755,7 +749,7 @@ void QQuickPathView::setCurrentIndex(int idx)
         }
         int oldCurrentIdx = d->currentIndex;
         QQuickItem *oldCurrentItem = d->currentItem;
-        d->currentItem = 0;
+        d->currentItem = nullptr;
         d->moveReason = QQuickPathViewPrivate::SetIndex;
         d->currentIndex = idx;
         if (d->modelCount) {
@@ -836,7 +830,7 @@ void QQuickPathViewPrivate::setOffset(qreal o)
     if (offset != o) {
         if (isValid() && q->isComponentComplete()) {
             qreal oldOffset = offset;
-            offset = qmlMod(o, qreal(modelCount));
+            offset = std::fmod(o, qreal(modelCount));
             if (offset < 0)
                 offset += qreal(modelCount);
             qCDebug(lcItemViewDelegateLifecycle) << o << "was" << oldOffset << "now" << offset;
@@ -902,7 +896,7 @@ void QQuickPathView::setHighlight(QQmlComponent *highlight)
 
   \sa highlight
 */
-QQuickItem *QQuickPathView::highlightItem()
+QQuickItem *QQuickPathView::highlightItem() const
 {
     Q_D(const QQuickPathView);
     return d->highlightItem;
@@ -1237,7 +1231,7 @@ QQmlComponent *QQuickPathView::delegate() const
             return dataModel->delegate();
     }
 
-    return 0;
+    return nullptr;
 }
 
 void QQuickPathView::setDelegate(QQmlComponent *delegate)
@@ -1468,7 +1462,7 @@ void QQuickPathView::positionViewAtIndex(int index, int mode)
         // Small offset since the last point coincides with the first and
         // this the only "end" position that gives the expected visual result.
         qreal adj = sizeof(qreal) == sizeof(float) ? 0.00001f : 0.000000000001;
-        endOffset = qmlMod(beginOffset + count, d->modelCount) - adj;
+        endOffset = std::fmod(beginOffset + count, qreal(d->modelCount)) - adj;
     }
     qreal offset = d->offset;
     switch (mode) {
@@ -1489,8 +1483,8 @@ void QQuickPathView::positionViewAtIndex(int index, int mode)
     case Contain:
         if ((beginOffset < endOffset && (d->offset < beginOffset || d->offset > endOffset))
                 || (d->offset < beginOffset && d->offset > endOffset)) {
-            qreal diff1 = qmlMod(beginOffset - d->offset + d->modelCount, d->modelCount);
-            qreal diff2 = qmlMod(d->offset - endOffset + d->modelCount, d->modelCount);
+            qreal diff1 = std::fmod(beginOffset - d->offset + d->modelCount, qreal(d->modelCount));
+            qreal diff2 = std::fmod(d->offset - endOffset + d->modelCount, qreal(d->modelCount));
             if (diff1 < diff2)
                 offset = beginOffset;
             else
@@ -1518,7 +1512,7 @@ int QQuickPathView::indexAt(qreal x, qreal y) const
 {
     Q_D(const QQuickPathView);
     QQuickItem *item = itemAt(x, y);
-    return item ? d->model->indexOf(item, 0) : -1;
+    return item ? d->model->indexOf(item, nullptr) : -1;
 }
 
 /*!
@@ -1533,7 +1527,7 @@ QQuickItem *QQuickPathView::itemAt(qreal x, qreal y) const
 {
     Q_D(const QQuickPathView);
     if (!d->isValid())
-        return 0;
+        return nullptr;
 
     for (QQuickItem *item : d->items) {
         QPointF p = item->mapFromItem(this, QPointF(x, y));
@@ -1541,7 +1535,7 @@ QQuickItem *QQuickPathView::itemAt(qreal x, qreal y) const
             return item;
     }
 
-    return 0;
+    return nullptr;
 }
 
 QPointF QQuickPathViewPrivate::pointNear(const QPointF &point, qreal *nearPercent) const
@@ -1606,7 +1600,7 @@ qreal QQuickPathViewPrivate::calcVelocity() const
     return velocity;
 }
 
-qint64 QQuickPathViewPrivate::computeCurrentTime(QInputEvent *event)
+qint64 QQuickPathViewPrivate::computeCurrentTime(QInputEvent *event) const
 {
     if (0 != event->timestamp())
         return event->timestamp();
@@ -1810,7 +1804,7 @@ bool QQuickPathView::sendMouseEvent(QMouseEvent *event)
     QPointF localPos = mapFromScene(event->windowPos());
 
     QQuickWindow *c = window();
-    QQuickItem *grabber = c ? c->mouseGrabberItem() : 0;
+    QQuickItem *grabber = c ? c->mouseGrabberItem() : nullptr;
     if (grabber == this && d->stealMouse) {
         // we are already the grabber and we do want the mouse event to ourselves.
         return true;
@@ -1836,7 +1830,7 @@ bool QQuickPathView::sendMouseEvent(QMouseEvent *event)
         default:
             break;
         }
-        grabber = c ? c->mouseGrabberItem() : 0;
+        grabber = c ? c->mouseGrabberItem() : nullptr;
         if ((grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this) || grabberDisabled) {
             grabMouse();
         }
@@ -1915,7 +1909,7 @@ void QQuickPathView::componentComplete()
     if (d->model) {
         d->modelCount = d->model->count();
         if (d->modelCount && d->currentIndex != 0) // an initial value has been provided for currentIndex
-            d->offset = qmlMod(d->modelCount - currentIndexRemainder(d->currentIndex, d->modelCount), d->modelCount);
+            d->offset = std::fmod(qreal(d->modelCount - currentIndexRemainder(d->currentIndex, d->modelCount)), qreal(d->modelCount));
     }
 
     d->createHighlight();
@@ -1951,7 +1945,7 @@ void QQuickPathView::refill()
     QList<QQuickItem*>::iterator it = d->items.begin();
     while (it != d->items.end()) {
         QQuickItem *item = *it;
-        int idx = d->model->indexOf(item, 0);
+        int idx = d->model->indexOf(item, nullptr);
         qreal pos = d->positionOfIndex(idx);
         if (lcItemViewDelegateLifecycle().isDebugEnabled()) {
             QQuickText *text = qmlobject_cast<QQuickText*>(item);
@@ -1996,7 +1990,7 @@ void QQuickPathView::refill()
                 startPos = 2.0;
 
                 for (QQuickItem * item : qAsConst(d->items)) {
-                    int idx = d->model->indexOf(item, 0);
+                    int idx = d->model->indexOf(item, nullptr);
                     qreal curPos = d->positionOfIndex(idx);
                     if (curPos > endPos) {
                         endPos = curPos;
@@ -2198,7 +2192,7 @@ void QQuickPathView::modelUpdated(const QQmlChangeSet &changeSet, bool reset)
                 if (QQuickPathViewAttached *att = d->attached(d->currentItem))
                     att->setIsCurrentItem(true);
                 d->releaseItem(d->currentItem);
-                d->currentItem = 0;
+                d->currentItem = nullptr;
             }
             d->currentIndex = qMin(r.index, d->modelCount - r.count - 1);
             currentChanged = true;
@@ -2231,7 +2225,7 @@ void QQuickPathView::modelUpdated(const QQmlChangeSet &changeSet, bool reset)
         d->modelCount += i.count;
     }
 
-    d->offset = qmlMod(d->offset, d->modelCount);
+    d->offset = std::fmod(d->offset, qreal(d->modelCount));
     if (d->offset < 0)
         d->offset += d->modelCount;
     if (d->currentIndex == -1)
@@ -2249,7 +2243,7 @@ void QQuickPathView::modelUpdated(const QQmlChangeSet &changeSet, bool reset)
         d->tl.reset(d->moveOffset);
     } else {
         if (!d->flicking && !d->moving && d->haveHighlightRange && d->highlightRangeMode == QQuickPathView::StrictlyEnforceRange) {
-            d->offset = qmlMod(d->modelCount - d->currentIndex, d->modelCount);
+            d->offset = std::fmod(qreal(d->modelCount - d->currentIndex), qreal(d->modelCount));
             changedOffset = true;
         }
         d->updateMappedRange();
@@ -2295,10 +2289,10 @@ int QQuickPathViewPrivate::calcCurrentIndex()
 {
     int current = 0;
     if (modelCount && model && items.count()) {
-        offset = qmlMod(offset, modelCount);
+        offset = std::fmod(offset, qreal(modelCount));
         if (offset < 0)
             offset += modelCount;
-        current = qRound(qAbs(qmlMod(modelCount - offset, modelCount)));
+        current = qRound(qAbs(std::fmod(modelCount - offset, qreal(modelCount))));
         current = current % modelCount;
     }
 
@@ -2312,7 +2306,7 @@ void QQuickPathViewPrivate::createCurrentItem()
 
     bool inItems = false;
     for (QQuickItem *item : qAsConst(items)) {
-        if (model->indexOf(item, 0) == currentIndex) {
+        if (model->indexOf(item, nullptr) == currentIndex) {
             inItems = true;
             break;
         }
@@ -2350,7 +2344,7 @@ void QQuickPathViewPrivate::updateCurrent()
         }
         int oldCurrentIndex = currentIndex;
         currentIndex = idx;
-        currentItem = 0;
+        currentItem = nullptr;
         createCurrentItem();
         if (oldCurrentIndex != currentIndex)
             emit q->currentIndexChanged();
@@ -2383,7 +2377,7 @@ void QQuickPathViewPrivate::snapToIndex(int index, MovementReason reason)
     if (!model || modelCount <= 0)
         return;
 
-    qreal targetOffset = qmlMod(modelCount - index, modelCount);
+    qreal targetOffset = std::fmod(qreal(modelCount - index), qreal(modelCount));
 
     if (offset == targetOffset)
         return;
diff --git a/src/quick/items/qquickpathview_p.h b/src/quick/items/qquickpathview_p.h
index bdd56b6311..669ef60ef7 100644
--- a/src/quick/items/qquickpathview_p.h
+++ b/src/quick/items/qquickpathview_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_pathview);
+
 #include "qquickitem.h"
 
 #include <private/qtquickglobal_p.h>
@@ -98,7 +102,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathView : public QQuickItem
     Q_PROPERTY(int cacheItemCount READ cacheItemCount WRITE setCacheItemCount NOTIFY cacheItemCountChanged)
 
 public:
-    QQuickPathView(QQuickItem *parent=0);
+    QQuickPathView(QQuickItem *parent = nullptr);
     virtual ~QQuickPathView();
 
     QVariant model() const;
@@ -117,7 +121,7 @@ public:
 
     QQmlComponent *highlight() const;
     void setHighlight(QQmlComponent *highlight);
-    QQuickItem *highlightItem();
+    QQuickItem *highlightItem() const;
 
     enum HighlightRangeMode { NoHighlightRange, ApplyRange, StrictlyEnforceRange };
     Q_ENUM(HighlightRangeMode)
@@ -255,7 +259,7 @@ public:
     QQuickPathViewAttached(QObject *parent);
     ~QQuickPathViewAttached();
 
-    QQuickPathView *view() { return m_view; }
+    QQuickPathView *view() const { return m_view; }
 
     bool isCurrentItem() const { return m_isCurrent; }
     void setIsCurrentItem(bool c) {
diff --git a/src/quick/items/qquickpathview_p_p.h b/src/quick/items/qquickpathview_p_p.h
index 0441603a4b..082f427f2c 100644
--- a/src/quick/items/qquickpathview_p_p.h
+++ b/src/quick/items/qquickpathview_p_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_pathview);
+
 #include "qquickpathview_p.h"
 #include "qquickitem_p.h"
 
@@ -125,7 +129,7 @@ public:
     QPointF pointNear(const QPointF &point, qreal *nearPercent=0) const;
     void addVelocitySample(qreal v);
     qreal calcVelocity() const;
-    qint64 computeCurrentTime(QInputEvent *event);
+    qint64 computeCurrentTime(QInputEvent *event) const;
     void setDragging(bool d);
 
     QQuickPath *path;
diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp
index 38e89e78eb..e22427ca49 100644
--- a/src/quick/items/qquickpositioners.cpp
+++ b/src/quick/items/qquickpositioners.cpp
@@ -872,7 +872,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem)
     the item that is being added. See the \l ViewTransition documentation for more details
     and examples on using these transitions.
 
-    \note This transition is not applied to the items that already part of the positioner
+    \note This transition is not applied to the items that are already part of the positioner
     at the time of its creation. In this case, the \l populate transition is applied instead.
 
     \sa populate, ViewTransition, {Qt Quick Examples - Positioners}
@@ -1039,7 +1039,7 @@ void QQuickColumn::reportConflictingAnchors()
     the item that is being added. See the \l ViewTransition documentation for more details
     and examples on using these transitions.
 
-    \note This transition is not applied to the items that already part of the positioner
+    \note This transition is not applied to the items that are already part of the positioner
     at the time of its creation. In this case, the \l populate transition is applied instead.
 
     \sa populate, ViewTransition, {Qt Quick Examples - Positioners}
@@ -1307,7 +1307,7 @@ void QQuickRow::reportConflictingAnchors()
     the item that is being added. See the \l ViewTransition documentation for more details
     and examples on using these transitions.
 
-    \note This transition is not applied to the items that already part of the positioner
+    \note This transition is not applied to the items that are already part of the positioner
     at the time of its creation. In this case, the \l populate transition is applied instead.
 
     \sa populate, ViewTransition, {Qt Quick Examples - Positioners}
@@ -1882,7 +1882,7 @@ void QQuickGrid::reportConflictingAnchors()
     the item that is being added. See the \l ViewTransition documentation for more details
     and examples on using these transitions.
 
-    \note This transition is not applied to the items that already part of the positioner
+    \note This transition is not applied to the items that are already part of the positioner
     at the time of its creation. In this case, the \l populate transition is applied instead.
 
     \sa populate, ViewTransition, {Qt Quick Examples - Positioners}
diff --git a/src/quick/items/qquickpositioners_p.h b/src/quick/items/qquickpositioners_p.h
index f6388f111d..c25ecd6dbc 100644
--- a/src/quick/items/qquickpositioners_p.h
+++ b/src/quick/items/qquickpositioners_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <QtQuick/private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_positioners);
+
 #include "qquickimplicitsizeitem_p.h"
 #include "qquickitemviewtransition_p.h"
 
diff --git a/src/quick/items/qquickpositioners_p_p.h b/src/quick/items/qquickpositioners_p_p.h
index d18f9b3724..6dd84e6098 100644
--- a/src/quick/items/qquickpositioners_p_p.h
+++ b/src/quick/items/qquickpositioners_p_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <QtQuick/private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_positioners);
+
 #include "qquickpositioners_p.h"
 #include "qquickimplicitsizeitem_p_p.h"
 
diff --git a/src/quick/items/qquickrectangle.cpp b/src/quick/items/qquickrectangle.cpp
index 9e747f2c47..7ba2421d62 100644
--- a/src/quick/items/qquickrectangle.cpp
+++ b/src/quick/items/qquickrectangle.cpp
@@ -365,7 +365,7 @@ QQuickPen *QQuickRectangle::border()
     The gradient to use to fill the rectangle.
 
     This property allows for the construction of simple vertical gradients.
-    Other gradients may by formed by adding rotation to the rectangle.
+    Other gradients may be formed by adding rotation to the rectangle.
 
     \div {class="float-left"}
     \inlineimage declarative-rect_gradient.png
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp
index 8b69447002..74aa2da9e0 100644
--- a/src/quick/items/qquickrendercontrol.cpp
+++ b/src/quick/items/qquickrendercontrol.cpp
@@ -47,8 +47,10 @@
 #ifndef QT_NO_OPENGL
 # include <QtGui/QOpenGLContext>
 # include <QtQuick/private/qsgdefaultrendercontext_p.h>
+#if QT_CONFIG(quick_shadereffect)
 # include <QtQuick/private/qquickopenglshadereffectnode_p.h>
 #endif
+#endif
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 
@@ -190,7 +192,7 @@ void QQuickRenderControlPrivate::windowDestroyed()
         delete QQuickWindowPrivate::get(window)->animationController;
         QQuickWindowPrivate::get(window)->animationController = 0;
 
-#ifndef QT_NO_OPENGL
+#if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl)
         QQuickOpenGLShaderEffectMaterial::cleanupMaterialCache();
 #endif
 
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index 5d01a2af9d..9347b55c70 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -207,100 +207,181 @@ QT_BEGIN_NAMESPACE
     By default it is set to the value of the QScreen that the window uses.
 */
 
-QQuickScreenAttached::QQuickScreenAttached(QObject* attachee)
-    : QObject(attachee)
-    , m_screen(NULL)
-    , m_window(NULL)
-    , m_updateMask(0)
-    , m_updateMaskSet(false)
+QQuickScreenInfo::QQuickScreenInfo(QObject *parent)
+    : QObject(parent),
+      m_screen(nullptr)
 {
-    m_attachee = qobject_cast<QQuickItem*>(attachee);
-
-    if (m_attachee) {
-        QQuickItemPrivate::get(m_attachee)->extra.value().screenAttached = this;
-
-        if (m_attachee->window()) //It might not be assigned to a window yet
-            windowChanged(m_attachee->window());
-    } else {
-        QQuickWindow *window = qobject_cast<QQuickWindow*>(attachee);
-        if (window)
-            windowChanged(window);
-    }
-
-    if (!m_screen)
-        screenChanged(QGuiApplication::primaryScreen());
 }
 
-QString QQuickScreenAttached::name() const
+QString QQuickScreenInfo::name() const
 {
     if (!m_screen)
         return QString();
     return m_screen->name();
 }
 
-int QQuickScreenAttached::width() const
+int QQuickScreenInfo::width() const
 {
     if (!m_screen)
         return 0;
     return m_screen->size().width();
 }
 
-int QQuickScreenAttached::height() const
+int QQuickScreenInfo::height() const
 {
     if (!m_screen)
         return 0;
     return m_screen->size().height();
 }
 
-int QQuickScreenAttached::desktopAvailableWidth() const
+int QQuickScreenInfo::desktopAvailableWidth() const
 {
     if (!m_screen)
         return 0;
     return m_screen->availableVirtualSize().width();
 }
 
-int QQuickScreenAttached::desktopAvailableHeight() const
+int QQuickScreenInfo::desktopAvailableHeight() const
 {
     if (!m_screen)
         return 0;
     return m_screen->availableVirtualSize().height();
 }
 
-qreal QQuickScreenAttached::logicalPixelDensity() const
+qreal QQuickScreenInfo::logicalPixelDensity() const
 {
     if (!m_screen)
         return 0.0;
     return m_screen->logicalDotsPerInch() / 25.4;
 }
 
-qreal QQuickScreenAttached::pixelDensity() const
+qreal QQuickScreenInfo::pixelDensity() const
 {
     if (!m_screen)
         return 0.0;
     return m_screen->physicalDotsPerInch() / 25.4;
 }
 
-qreal QQuickScreenAttached::devicePixelRatio() const
+qreal QQuickScreenInfo::devicePixelRatio() const
 {
     if (!m_screen)
         return 1.0;
     return m_screen->devicePixelRatio();
 }
 
-Qt::ScreenOrientation QQuickScreenAttached::primaryOrientation() const
+Qt::ScreenOrientation QQuickScreenInfo::primaryOrientation() const
 {
     if (!m_screen)
         return Qt::PrimaryOrientation;
     return m_screen->primaryOrientation();
 }
 
-Qt::ScreenOrientation QQuickScreenAttached::orientation() const
+Qt::ScreenOrientation QQuickScreenInfo::orientation() const
 {
     if (!m_screen)
         return Qt::PrimaryOrientation;
     return m_screen->orientation();
 }
 
+int QQuickScreenInfo::virtualX() const
+{
+    if (!m_screen)
+        return 0;
+    return m_screen->geometry().topLeft().x();
+}
+
+int QQuickScreenInfo::virtualY() const
+{
+    if (!m_screen)
+        return 0;
+    return m_screen->geometry().topLeft().y();
+}
+
+void QQuickScreenInfo::setWrappedScreen(QScreen *screen)
+{
+    if (screen == m_screen)
+        return;
+
+    QScreen *oldScreen = m_screen;
+    m_screen = screen;
+
+    if (oldScreen)
+        oldScreen->disconnect(this);
+
+    if (!screen) //Don't bother emitting signals, because the new values are garbage anyways
+        return;
+
+    if (!oldScreen || screen->geometry() != oldScreen->geometry()) {
+        emit virtualXChanged();
+        emit virtualYChanged();
+    }
+    if (!oldScreen || screen->size() != oldScreen->size()) {
+        emit widthChanged();
+        emit heightChanged();
+    }
+    if (!oldScreen || screen->name() != oldScreen->name())
+        emit nameChanged();
+    if (!oldScreen || screen->orientation() != oldScreen->orientation())
+        emit orientationChanged();
+    if (!oldScreen || screen->primaryOrientation() != oldScreen->primaryOrientation())
+        emit primaryOrientationChanged();
+    if (!oldScreen || screen->availableVirtualGeometry() != oldScreen->availableVirtualGeometry())
+        emit desktopGeometryChanged();
+    if (!oldScreen || screen->logicalDotsPerInch() != oldScreen->logicalDotsPerInch())
+        emit logicalPixelDensityChanged();
+    if (!oldScreen || screen->physicalDotsPerInch() != oldScreen->physicalDotsPerInch())
+        emit pixelDensityChanged();
+    if (!oldScreen || screen->devicePixelRatio() != oldScreen->devicePixelRatio())
+        emit devicePixelRatioChanged();
+
+    connect(screen, SIGNAL(geometryChanged(QRect)),
+            this, SIGNAL(widthChanged()));
+    connect(screen, SIGNAL(geometryChanged(QRect)),
+            this, SIGNAL(heightChanged()));
+    connect(screen, SIGNAL(geometryChanged(QRect)),
+            this, SIGNAL(virtualXChanged()));
+    connect(screen, SIGNAL(geometryChanged(QRect)),
+            this, SIGNAL(virtualYChanged()));
+    connect(screen, SIGNAL(orientationChanged(Qt::ScreenOrientation)),
+            this, SIGNAL(orientationChanged()));
+    connect(screen, SIGNAL(primaryOrientationChanged(Qt::ScreenOrientation)),
+            this, SIGNAL(primaryOrientationChanged()));
+    connect(screen, SIGNAL(virtualGeometryChanged(QRect)),
+            this, SIGNAL(desktopGeometryChanged()));
+    connect(screen, SIGNAL(logicalDotsPerInchChanged(qreal)),
+            this, SIGNAL(logicalPixelDensityChanged()));
+    connect(screen, SIGNAL(physicalDotsPerInchChanged(qreal)),
+            this, SIGNAL(pixelDensityChanged()));
+}
+
+QScreen *QQuickScreenInfo::wrappedScreen() const
+{
+    return m_screen;
+}
+
+QQuickScreenAttached::QQuickScreenAttached(QObject* attachee)
+    : QQuickScreenInfo(attachee)
+    , m_window(NULL)
+    , m_updateMask(0)
+    , m_updateMaskSet(false)
+{
+    m_attachee = qobject_cast<QQuickItem*>(attachee);
+
+    if (m_attachee) {
+        QQuickItemPrivate::get(m_attachee)->extra.value().screenAttached = this;
+
+        if (m_attachee->window()) //It might not be assigned to a window yet
+            windowChanged(m_attachee->window());
+    } else {
+        QQuickWindow *window = qobject_cast<QQuickWindow*>(attachee);
+        if (window)
+            windowChanged(window);
+    }
+
+    if (!m_screen)
+        screenChanged(QGuiApplication::primaryScreen());
+}
+
 Qt::ScreenOrientations QQuickScreenAttached::orientationUpdateMask() const
 {
     return m_updateMask;
@@ -341,55 +422,15 @@ void QQuickScreenAttached::screenChanged(QScreen *screen)
 {
     //qDebug() << "QQuickScreenAttached::screenChanged" << (screen ? screen->name() : QString::fromLatin1("null"));
     if (screen != m_screen) {
-        QScreen* oldScreen = m_screen;
-        m_screen = screen;
-
-        if (oldScreen)
-            oldScreen->disconnect(this);
-
-        if (!screen)
-            return; //Don't bother emitting signals, because the new values are garbage anyways
-
+        setWrappedScreen(screen);
+        if (!m_screen)
+            return;
         if (m_updateMaskSet) {
-            screen->setOrientationUpdateMask(m_updateMask);
-        } else if (m_updateMask != screen->orientationUpdateMask()) {
-            m_updateMask = screen->orientationUpdateMask();
+            m_screen->setOrientationUpdateMask(m_updateMask);
+        } else if (m_updateMask != m_screen->orientationUpdateMask()) {
+            m_updateMask = m_screen->orientationUpdateMask();
             emit orientationUpdateMaskChanged();
         }
-
-        if (!oldScreen || screen->size() != oldScreen->size()) {
-            emit widthChanged();
-            emit heightChanged();
-        }
-        if (!oldScreen || screen->name() != oldScreen->name())
-            emit nameChanged();
-        if (!oldScreen || screen->orientation() != oldScreen->orientation())
-            emit orientationChanged();
-        if (!oldScreen || screen->primaryOrientation() != oldScreen->primaryOrientation())
-            emit primaryOrientationChanged();
-        if (!oldScreen || screen->availableVirtualGeometry() != oldScreen->availableVirtualGeometry())
-            emit desktopGeometryChanged();
-        if (!oldScreen || screen->logicalDotsPerInch() != oldScreen->logicalDotsPerInch())
-            emit logicalPixelDensityChanged();
-        if (!oldScreen || screen->physicalDotsPerInch() != oldScreen->physicalDotsPerInch())
-            emit pixelDensityChanged();
-        if (!oldScreen || screen->devicePixelRatio() != oldScreen->devicePixelRatio())
-            emit devicePixelRatioChanged();
-
-        connect(screen, SIGNAL(geometryChanged(QRect)),
-                this, SIGNAL(widthChanged()));
-        connect(screen, SIGNAL(geometryChanged(QRect)),
-                this, SIGNAL(heightChanged()));
-        connect(screen, SIGNAL(orientationChanged(Qt::ScreenOrientation)),
-                this, SIGNAL(orientationChanged()));
-        connect(screen, SIGNAL(primaryOrientationChanged(Qt::ScreenOrientation)),
-                this, SIGNAL(primaryOrientationChanged()));
-        connect(screen, SIGNAL(virtualGeometryChanged(QRect)),
-                this, SIGNAL(desktopGeometryChanged()));
-        connect(screen, SIGNAL(logicalDotsPerInchChanged(qreal)),
-                this, SIGNAL(logicalPixelDensityChanged()));
-        connect(screen, SIGNAL(physicalDotsPerInchChanged(qreal)),
-                this, SIGNAL(pixelDensityChanged()));
     }
 }
 
diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h
index 06d9a06070..06efb3ab45 100644
--- a/src/quick/items/qquickscreen_p.h
+++ b/src/quick/items/qquickscreen_p.h
@@ -63,10 +63,10 @@ class QQuickItem;
 class QQuickWindow;
 class QScreen;
 
-class Q_AUTOTEST_EXPORT QQuickScreenAttached : public QObject
+
+class Q_AUTOTEST_EXPORT QQuickScreenInfo : public QObject
 {
     Q_OBJECT
-
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
     Q_PROPERTY(int width READ width NOTIFY widthChanged)
     Q_PROPERTY(int height READ height NOTIFY heightChanged)
@@ -79,11 +79,12 @@ class Q_AUTOTEST_EXPORT QQuickScreenAttached : public QObject
     Q_PROPERTY(Qt::ScreenOrientation primaryOrientation READ primaryOrientation NOTIFY primaryOrientationChanged)
     // TODO Qt 6 Remove this orientation -> incomplete device orientation -> better use OrientationSensor
     Q_PROPERTY(Qt::ScreenOrientation orientation READ orientation NOTIFY orientationChanged)
-    Q_PROPERTY(Qt::ScreenOrientations orientationUpdateMask READ orientationUpdateMask
-               WRITE setOrientationUpdateMask NOTIFY orientationUpdateMaskChanged)
+
+    Q_PROPERTY(int virtualX READ virtualX NOTIFY virtualXChanged REVISION 1)
+    Q_PROPERTY(int virtualY READ virtualY NOTIFY virtualYChanged REVISION 1)
 
 public:
-    QQuickScreenAttached(QObject* attachee);
+    QQuickScreenInfo(QObject *parent = nullptr);
 
     QString name() const;
     int width() const;
@@ -95,13 +96,11 @@ public:
     qreal devicePixelRatio() const;
     Qt::ScreenOrientation primaryOrientation() const;
     Qt::ScreenOrientation orientation() const;
-    Qt::ScreenOrientations orientationUpdateMask() const;
-    void setOrientationUpdateMask(Qt::ScreenOrientations mask);
+    int virtualX() const;
+    int virtualY() const;
 
-    //Treats int as Qt::ScreenOrientation, due to QTBUG-20639
-    Q_INVOKABLE int angleBetween(int a, int b);
-
-    void windowChanged(QQuickWindow*);
+    void setWrappedScreen(QScreen *screen);
+    QScreen *wrappedScreen() const;
 
 Q_SIGNALS:
     void nameChanged();
@@ -113,13 +112,37 @@ Q_SIGNALS:
     void devicePixelRatioChanged();
     void primaryOrientationChanged();
     void orientationChanged();
+    Q_REVISION(1) void virtualXChanged();
+    Q_REVISION(1) void virtualYChanged();
+
+protected:
+    QPointer<QScreen> m_screen;
+};
+
+class Q_AUTOTEST_EXPORT QQuickScreenAttached : public QQuickScreenInfo
+{
+    Q_OBJECT
+    Q_PROPERTY(Qt::ScreenOrientations orientationUpdateMask READ orientationUpdateMask
+               WRITE setOrientationUpdateMask NOTIFY orientationUpdateMaskChanged)
+
+public:
+    QQuickScreenAttached(QObject* attachee);
+
+    Qt::ScreenOrientations orientationUpdateMask() const;
+    void setOrientationUpdateMask(Qt::ScreenOrientations mask);
+
+    //Treats int as Qt::ScreenOrientation, due to QTBUG-20639
+    Q_INVOKABLE int angleBetween(int a, int b);
+
+    void windowChanged(QQuickWindow*);
+
+Q_SIGNALS:
     void orientationUpdateMaskChanged();
 
 protected Q_SLOTS:
     void screenChanged(QScreen*);
 
 private:
-    QPointer<QScreen> m_screen;
     QQuickWindow* m_window;
     QQuickItem* m_attachee;
     Qt::ScreenOrientations m_updateMask;
@@ -136,5 +159,6 @@ public:
 QT_END_NAMESPACE
 
 QML_DECLARE_TYPEINFO(QQuickScreen, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(QQuickScreenInfo)
 
 #endif
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h
index 17b009039a..2b7ff4cf6e 100644
--- a/src/quick/items/qquickshadereffect_p.h
+++ b/src/quick/items/qquickshadereffect_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_shadereffect);
+
 #include <QtQuick/qquickitem.h>
 #include <private/qtquickglobal_p.h>
 
diff --git a/src/quick/items/qquickshadereffectmesh.cpp b/src/quick/items/qquickshadereffectmesh.cpp
index 8616bf8022..d23b576d42 100644
--- a/src/quick/items/qquickshadereffectmesh.cpp
+++ b/src/quick/items/qquickshadereffectmesh.cpp
@@ -95,9 +95,8 @@ bool QQuickGridMesh::validateAttributes(const QVector<QByteArray> &attributes, i
         return false;
     case 1:
         if (positionIndex != 0) {
-            m_log = QLatin1String("Error: Missing \'");
-            m_log += QLatin1String(qtPositionAttributeName());
-            m_log += QLatin1String("\' attribute.\n");
+            m_log = QLatin1String("Error: Missing \'") + QLatin1String(qtPositionAttributeName())
+                    + QLatin1String("\' attribute.\n");
             return false;
         }
         break;
@@ -105,14 +104,12 @@ bool QQuickGridMesh::validateAttributes(const QVector<QByteArray> &attributes, i
         if (positionIndex == -1 || texCoordIndex == -1) {
             m_log.clear();
             if (positionIndex == -1) {
-                m_log = QLatin1String("Error: Missing \'");
-                m_log += QLatin1String(qtPositionAttributeName());
-                m_log += QLatin1String("\' attribute.\n");
+                m_log = QLatin1String("Error: Missing \'") + QLatin1String(qtPositionAttributeName())
+                        + QLatin1String("\' attribute.\n");
             }
             if (texCoordIndex == -1) {
-                m_log += QLatin1String("Error: Missing \'");
-                m_log += QLatin1String(qtTexCoordAttributeName());
-                m_log += QLatin1String("\' attribute.\n");
+                m_log += QLatin1String("Error: Missing \'") + QLatin1String(qtTexCoordAttributeName())
+                         + QLatin1String("\' attribute.\n");
             }
             return false;
         }
@@ -140,7 +137,7 @@ QSGGeometry *QQuickGridMesh::updateGeometry(QSGGeometry *geometry, int attrCount
                                    ? QSGGeometry::defaultAttributes_Point2D()
                                    : QSGGeometry::defaultAttributes_TexturedPoint2D(),
                                    (vmesh + 1) * (hmesh + 1), vmesh * 2 * (hmesh + 2),
-                                   QSGGeometry::TypeUnsignedShort);
+                                   QSGGeometry::UnsignedShortType);
 
     } else {
         geometry->allocate((vmesh + 1) * (hmesh + 1), vmesh * 2 * (hmesh + 2));
@@ -367,7 +364,7 @@ QSGGeometry *QQuickBorderImageMesh::updateGeometry(QSGGeometry *geometry, int at
     }
     \endqml
 */
-QQuickScaleGrid *QQuickBorderImageMesh::border()
+QQuickScaleGrid *QQuickBorderImageMesh::border() const
 {
     return m_border;
 }
diff --git a/src/quick/items/qquickshadereffectmesh_p.h b/src/quick/items/qquickshadereffectmesh_p.h
index c5f1d19866..aa3112b5a5 100644
--- a/src/quick/items/qquickshadereffectmesh_p.h
+++ b/src/quick/items/qquickshadereffectmesh_p.h
@@ -37,6 +37,10 @@
 **
 ****************************************************************************/
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_shadereffect);
+
 #include "qqmlparserstatus.h"
 
 #include <QtQuick/qtquickglobal.h>
@@ -123,7 +127,7 @@ public:
     QSGGeometry *updateGeometry(QSGGeometry *geometry, int attrCount, int posIndex,
                                 const QRectF &srcRect, const QRectF &rect) override;
 
-    QQuickScaleGrid *border();
+    QQuickScaleGrid *border() const;
 
     enum TileMode { Stretch = Qt::StretchTile, Repeat = Qt::RepeatTile, Round = Qt::RoundTile };
     Q_ENUM(TileMode)
diff --git a/src/quick/items/qquickshadereffectsource.cpp b/src/quick/items/qquickshadereffectsource.cpp
index a60a06f59a..1b37a746d3 100644
--- a/src/quick/items/qquickshadereffectsource.cpp
+++ b/src/quick/items/qquickshadereffectsource.cpp
@@ -64,7 +64,7 @@ public:
     {
     }
 
-    QSGTexture *texture() const {
+    QSGTexture *texture() const override {
         sourceTexture->setMipmapFiltering(mipmapFiltering);
         sourceTexture->setFiltering(filtering);
         sourceTexture->setHorizontalWrapMode(horizontalWrap);
diff --git a/src/quick/items/qquickshadereffectsource_p.h b/src/quick/items/qquickshadereffectsource_p.h
index ee18bf195a..5e7e354feb 100644
--- a/src/quick/items/qquickshadereffectsource_p.h
+++ b/src/quick/items/qquickshadereffectsource_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <QtQuick/private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_shadereffect);
+
 #include "qquickitem.h"
 #include <QtQuick/qsgtextureprovider.h>
 #include <private/qsgadaptationlayer_p.h>
diff --git a/src/quick/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h
index 684d432f39..d68a45ecc0 100644
--- a/src/quick/items/qquicksprite_p.h
+++ b/src/quick/items/qquicksprite_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_sprite);
+
 #include <QObject>
 #include <QUrl>
 #include <QVariantMap>
@@ -325,4 +329,5 @@ private:
 };
 
 QT_END_NAMESPACE
+
 #endif // QQUICKSPRITE_P_H
diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp
index 10e0d51709..74b04a75ad 100644
--- a/src/quick/items/qquickspriteengine.cpp
+++ b/src/quick/items/qquickspriteengine.cpp
@@ -323,13 +323,13 @@ void QQuickStochasticEngine::setGoal(int state, int sprite, bool jump)
     return;
 }
 
-QQuickPixmap::Status QQuickSpriteEngine::status()//Composed status of all Sprites
+QQuickPixmap::Status QQuickSpriteEngine::status() const //Composed status of all Sprites
 {
     if (!m_startedImageAssembly)
         return QQuickPixmap::Null;
     int null, loading, ready;
     null = loading = ready = 0;
-    for (QQuickSprite* s : qAsConst(m_sprites)) {
+    for (QQuickSprite* s : m_sprites) {
         switch (s->m_pix.status()) {
             // ### Maybe add an error message here, because this null shouldn't be reached but when it does, the image fails without an error message.
             case QQuickPixmap::Null : null++; break;
diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h
index 485afc16e5..89de9ce4f2 100644
--- a/src/quick/items/qquickspriteengine_p.h
+++ b/src/quick/items/qquickspriteengine_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_sprite);
+
 #include <QObject>
 #include <QVector>
 #include <QTimer>
@@ -289,11 +293,11 @@ public:
     void advance(int index=0) Q_DECL_OVERRIDE;
 
     //Similar API to QQuickPixmap for async loading convenience
-    bool isNull() { return status() == QQuickPixmap::Null; }
-    bool isReady() { return status() == QQuickPixmap::Ready; }
-    bool isLoading() { return status() == QQuickPixmap::Loading; }
-    bool isError() { return status() == QQuickPixmap::Error; }
-    QQuickPixmap::Status status();//Composed status of all Sprites
+    bool isNull() const { return status() == QQuickPixmap::Null; }
+    bool isReady() const { return status() == QQuickPixmap::Ready; }
+    bool isLoading() const { return status() == QQuickPixmap::Loading; }
+    bool isError() const { return status() == QQuickPixmap::Error; }
+    QQuickPixmap::Status status() const; //Composed status of all Sprites
     void startAssemblingImage();
     QImage assembledImage(int maxSize = 2048);
 
diff --git a/src/quick/items/qquickspritesequence_p.h b/src/quick/items/qquickspritesequence_p.h
index 34af110a98..b80a8348aa 100644
--- a/src/quick/items/qquickspritesequence_p.h
+++ b/src/quick/items/qquickspritesequence_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_sprite);
+
 #include <QtQuick/QQuickItem>
 #include <QTime>
 
diff --git a/src/quick/items/qquickspritesequence_p_p.h b/src/quick/items/qquickspritesequence_p_p.h
index 4f352b5b69..3579833116 100644
--- a/src/quick/items/qquickspritesequence_p_p.h
+++ b/src/quick/items/qquickspritesequence_p_p.h
@@ -51,6 +51,10 @@
 // We mean it.
 //
 
+#include <private/qtquickglobal_p.h>
+
+QT_REQUIRE_CONFIG(quick_sprite);
+
 #include "qquickitem_p.h"
 #include "qquicksprite_p.h"
 
diff --git a/src/quick/items/qquickstateoperations.cpp b/src/quick/items/qquickstateoperations.cpp
index 7e485c675c..9cd3b6a5f5 100644
--- a/src/quick/items/qquickstateoperations.cpp
+++ b/src/quick/items/qquickstateoperations.cpp
@@ -899,9 +899,9 @@ QQuickAnchorChanges::ActionList QQuickAnchorChanges::actions()
     return ActionList() << a;
 }
 
-QQuickAnchorSet *QQuickAnchorChanges::anchors()
+QQuickAnchorSet *QQuickAnchorChanges::anchors() const
 {
-    Q_D(QQuickAnchorChanges);
+    Q_D(const QQuickAnchorChanges);
     return d->anchorSet;
 }
 
@@ -1134,9 +1134,9 @@ QQuickStateActionEvent::EventType QQuickAnchorChanges::type() const
     return AnchorChanges;
 }
 
-QList<QQuickStateAction> QQuickAnchorChanges::additionalActions()
+QList<QQuickStateAction> QQuickAnchorChanges::additionalActions() const
 {
-    Q_D(QQuickAnchorChanges);
+    Q_D(const QQuickAnchorChanges);
     QList<QQuickStateAction> extra;
 
     QQuickAnchors::Anchors combined = d->anchorSet->d_func()->usedAnchors | d->anchorSet->d_func()->resetAnchors;
diff --git a/src/quick/items/qquickstateoperations_p.h b/src/quick/items/qquickstateoperations_p.h
index 29dec218fa..48b4b23a76 100644
--- a/src/quick/items/qquickstateoperations_p.h
+++ b/src/quick/items/qquickstateoperations_p.h
@@ -192,7 +192,7 @@ public:
 
     ActionList actions() Q_DECL_OVERRIDE;
 
-    QQuickAnchorSet *anchors();
+    QQuickAnchorSet *anchors() const;
 
     QQuickItem *object() const;
     void setObject(QQuickItem *);
@@ -210,7 +210,7 @@ public:
     void rewind() Q_DECL_OVERRIDE;
     void saveCurrentValues() Q_DECL_OVERRIDE;
 
-    QList<QQuickStateAction> additionalActions();
+    QList<QQuickStateAction> additionalActions() const;
     void saveTargetValues() Q_DECL_OVERRIDE;
 };
 
diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 14268b472e..2bfb4501fc 100644
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -898,11 +898,11 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline)
 
             // If the width of the item has changed and it's possible the result of wrapping,
             // eliding, scaling has changed, or the text is not left aligned do another layout.
-            if ((lineWidth < qMin(oldWidth, naturalWidth) || (widthExceeded && lineWidth > oldWidth))
+            if ((!qFuzzyCompare(lineWidth, oldWidth) || (widthExceeded && lineWidth > oldWidth))
                     && (singlelineElide || multilineElide || canWrap || horizontalFit
                         || q->effectiveHAlign() != QQuickText::AlignLeft)) {
                 widthChanged = true;
-                widthExceeded = false;
+                widthExceeded = lineWidth >= qMin(oldWidth, naturalWidth);
                 heightExceeded = false;
                 continue;
             }
@@ -937,7 +937,7 @@ QRectF QQuickTextPrivate::setupTextLayout(qreal *const baseline)
 
             bool wasInLayout = internalWidthUpdate;
             internalWidthUpdate = true;
-            q->setImplicitHeight(naturalHeight);
+            q->setImplicitHeight(naturalHeight + q->topPadding() + q->bottomPadding());
             internalWidthUpdate = wasInLayout;
 
             multilineElide = elideMode == QQuickText::ElideRight
diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index ef7485a8e9..fe29249934 100644
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -1664,8 +1664,8 @@ void QQuickTextControl::insertFromMimeData(const QMimeData *source)
 #ifndef QT_NO_TEXTHTMLPARSER
     if (source->hasFormat(QLatin1String("application/x-qrichtext")) && d->acceptRichText) {
         // x-qrichtext is always UTF-8 (taken from Qt3 since we don't use it anymore).
-        QString richtext = QString::fromUtf8(source->data(QLatin1String("application/x-qrichtext")));
-        richtext.prepend(QLatin1String("<meta name=\"qrichtext\" content=\"1\" />"));
+        const QString richtext = QLatin1String("<meta name=\"qrichtext\" content=\"1\" />")
+                + QString::fromUtf8(source->data(QLatin1String("application/x-qrichtext")));
         fragment = QTextDocumentFragment::fromHtml(richtext, d->doc);
         hasData = true;
     } else if (source->hasHtml() && d->acceptRichText) {
diff --git a/src/quick/items/qquicktextcontrol_p.h b/src/quick/items/qquicktextcontrol_p.h
index 602e457cb8..e06e3b8b29 100644
--- a/src/quick/items/qquicktextcontrol_p.h
+++ b/src/quick/items/qquicktextcontrol_p.h
@@ -193,9 +193,11 @@ class QQuickTextEditMimeData : public QMimeData
 public:
     inline QQuickTextEditMimeData(const QTextDocumentFragment &aFragment) : fragment(aFragment) {}
 
-    virtual QStringList formats() const;
+    QStringList formats() const override;
+
 protected:
-    virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type) const;
+    QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override;
+
 private:
     void setup() const;
 
diff --git a/src/quick/items/qquicktextdocument.cpp b/src/quick/items/qquicktextdocument.cpp
index 1dc54eb107..287e07e980 100644
--- a/src/quick/items/qquicktextdocument.cpp
+++ b/src/quick/items/qquicktextdocument.cpp
@@ -179,7 +179,7 @@ void QQuickTextDocumentWithImageResources::drawObject(
 {
 }
 
-QImage QQuickTextDocumentWithImageResources::image(const QTextImageFormat &format)
+QImage QQuickTextDocumentWithImageResources::image(const QTextImageFormat &format) const
 {
     QVariant res = resource(QTextDocument::ImageResource, QUrl(format.name()));
     return res.value<QImage>();
diff --git a/src/quick/items/qquicktextdocument_p.h b/src/quick/items/qquicktextdocument_p.h
index 3ffedb5b96..1218b12b89 100644
--- a/src/quick/items/qquicktextdocument_p.h
+++ b/src/quick/items/qquicktextdocument_p.h
@@ -75,10 +75,10 @@ public:
     void setText(const QString &);
     int resourcesLoading() const { return outstanding; }
 
-    QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format);
-    void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format);
+    QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format) override;
+    void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) override;
 
-    QImage image(const QTextImageFormat &format);
+    QImage image(const QTextImageFormat &format) const;
 
 public Q_SLOTS:
     void clearResources();
@@ -87,7 +87,7 @@ Q_SIGNALS:
     void imagesLoaded();
 
 protected:
-    QVariant loadResource(int type, const QUrl &name);
+    QVariant loadResource(int type, const QUrl &name) override;
 
     QQuickPixmap *loadPixmap(QQmlContext *context, const QUrl &name);
 
diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index c81544cbdb..4a5358faae 100644
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -2566,7 +2566,7 @@ void QQuickTextEditPrivate::updateDefaultTextOption()
 {
     Q_Q(QQuickTextEdit);
     QTextOption opt = document->defaultTextOption();
-    int oldAlignment = opt.alignment();
+    const Qt::Alignment oldAlignment = opt.alignment();
     Qt::LayoutDirection oldTextDirection = opt.textDirection();
 
     QQuickTextEdit::HAlignment horizontalAlignment = q->effectiveHAlign();
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index 6543a64624..fbfaa0e199 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -766,7 +766,7 @@ void QQuickTextInput::setMaxLength(int ml)
     (but without actually giving it active focus).
 
     It should not be set directly on the item, like in the below QML,
-    as the specified value will be overridden an lost on focus changes.
+    as the specified value will be overridden and lost on focus changes.
 
     \code
     TextInput {
@@ -1993,7 +1993,7 @@ bool QQuickTextInput::isRightToLeft(int start, int end)
         qmlInfo(this) << "isRightToLeft(start, end) called with the end property being smaller than the start.";
         return false;
     } else {
-        return text().mid(start, end - start).isRightToLeft();
+        return text().midRef(start, end - start).isRightToLeft();
     }
 }
 
@@ -2340,8 +2340,8 @@ QString QQuickTextInput::preeditText() const
 
     If true, the user can use the mouse to select text in some
     platform-specific way. Note that for some platforms this may
-    not be an appropriate interaction (eg. may conflict with how
-    the text needs to behave inside a Flickable.
+    not be an appropriate interaction (it may conflict with how
+    the text needs to behave inside a \l Flickable, for example).
 */
 bool QQuickTextInput::selectByMouse() const
 {
@@ -2843,7 +2843,7 @@ void QQuickTextInputPrivate::updateDisplayText(bool forceUpdate)
     // drawing boxes when using fonts that don't have glyphs for such
     // characters)
     QChar* uc = str.data();
-    for (int i = 0; i < (int)str.length(); ++i) {
+    for (int i = 0; i < str.length(); ++i) {
         if ((uc[i].unicode() < 0x20 && uc[i] != QChar::Tabulation)
             || uc[i] == QChar::LineSeparator
             || uc[i] == QChar::ParagraphSeparator
@@ -3229,7 +3229,7 @@ void QQuickTextInputPrivate::setSelection(int start, int length)
     commitPreedit();
 #endif
 
-    if (start < 0 || start > (int)m_text.length()){
+    if (start < 0 || start > m_text.length()) {
         qWarning("QQuickTextInputPrivate::setSelection: Invalid start position");
         return;
     }
@@ -3238,7 +3238,7 @@ void QQuickTextInputPrivate::setSelection(int start, int length)
         if (start == m_selstart && start + length == m_selend && m_cursor == m_selend)
             return;
         m_selstart = start;
-        m_selend = qMin(start + length, (int)m_text.length());
+        m_selend = qMin(start + length, m_text.length());
         m_cursor = m_selend;
     } else if (length < 0){
         if (start == m_selend && start + length == m_selstart && m_cursor == m_selstart)
@@ -3676,7 +3676,7 @@ void QQuickTextInputPrivate::internalInsert(const QString &s)
     Q_ASSERT(!hasSelectedText());   // insert(), processInputMethodEvent() call removeSelectedText() first.
     if (m_maskData) {
         QString ms = maskString(m_cursor, s);
-        for (int i = 0; i < (int) ms.length(); ++i) {
+        for (int i = 0; i < ms.length(); ++i) {
             addCommand (Command(DeleteSelection, m_cursor + i, m_text.at(m_cursor + i), -1, -1));
             addCommand(Command(Insert, m_cursor + i, ms.at(i), -1, -1));
         }
@@ -3687,9 +3687,10 @@ void QQuickTextInputPrivate::internalInsert(const QString &s)
     } else {
         int remaining = m_maxLength - m_text.length();
         if (remaining != 0) {
-            m_text.insert(m_cursor, s.left(remaining));
-            for (int i = 0; i < (int) s.leftRef(remaining).length(); ++i)
-               addCommand(Command(Insert, m_cursor++, s.at(i), -1, -1));
+            const QStringRef remainingStr = s.leftRef(remaining);
+            m_text.insert(m_cursor, remainingStr);
+            for (auto e : remainingStr)
+               addCommand(Command(Insert, m_cursor++, e, -1, -1));
             m_textDirty = true;
         }
     }
@@ -3708,7 +3709,7 @@ void QQuickTextInputPrivate::internalInsert(const QString &s)
 */
 void QQuickTextInputPrivate::internalDelete(bool wasBackspace)
 {
-    if (m_cursor < (int) m_text.length()) {
+    if (m_cursor < m_text.length()) {
         cancelPasswordEchoTimer();
         Q_ASSERT(!hasSelectedText());   // del(), backspace() call removeSelectedText() first.
         addCommand(Command((CommandType)((m_maskData ? 2 : 0) + (wasBackspace ? Remove : Delete)),
@@ -3734,7 +3735,7 @@ void QQuickTextInputPrivate::internalDelete(bool wasBackspace)
 */
 void QQuickTextInputPrivate::removeSelectedText()
 {
-    if (m_selstart < m_selend && m_selend <= (int) m_text.length()) {
+    if (m_selstart < m_selend && m_selend <= m_text.length()) {
         cancelPasswordEchoTimer();
         int i ;
         if (m_selstart <= m_cursor && m_cursor < m_selend) {
@@ -4020,44 +4021,44 @@ QString QQuickTextInputPrivate::maskString(uint pos, const QString &str, bool cl
         if (strIndex < str.length()) {
             if (m_maskData[i].separator) {
                 s += m_maskData[i].maskChar;
-                if (str[(int)strIndex] == m_maskData[i].maskChar)
+                if (str[strIndex] == m_maskData[i].maskChar)
                     strIndex++;
                 ++i;
             } else {
-                if (isValidInput(str[(int)strIndex], m_maskData[i].maskChar)) {
+                if (isValidInput(str[strIndex], m_maskData[i].maskChar)) {
                     switch (m_maskData[i].caseMode) {
                     case MaskInputData::Upper:
-                        s += str[(int)strIndex].toUpper();
+                        s += str[strIndex].toUpper();
                         break;
                     case MaskInputData::Lower:
-                        s += str[(int)strIndex].toLower();
+                        s += str[strIndex].toLower();
                         break;
                     default:
-                        s += str[(int)strIndex];
+                        s += str[strIndex];
                     }
                     ++i;
                 } else {
                     // search for separator first
-                    int n = findInMask(i, true, true, str[(int)strIndex]);
+                    int n = findInMask(i, true, true, str[strIndex]);
                     if (n != -1) {
-                        if (str.length() != 1 || i == 0 || (i > 0 && (!m_maskData[i-1].separator || m_maskData[i-1].maskChar != str[(int)strIndex]))) {
+                        if (str.length() != 1 || i == 0 || (i > 0 && (!m_maskData[i-1].separator || m_maskData[i-1].maskChar != str[strIndex]))) {
                             s += fill.midRef(i, n-i+1);
                             i = n + 1; // update i to find + 1
                         }
                     } else {
                         // search for valid m_blank if not
-                        n = findInMask(i, true, false, str[(int)strIndex]);
+                        n = findInMask(i, true, false, str[strIndex]);
                         if (n != -1) {
                             s += fill.midRef(i, n-i);
                             switch (m_maskData[n].caseMode) {
                             case MaskInputData::Upper:
-                                s += str[(int)strIndex].toUpper();
+                                s += str[strIndex].toUpper();
                                 break;
                             case MaskInputData::Lower:
-                                s += str[(int)strIndex].toLower();
+                                s += str[strIndex].toLower();
                                 break;
                             default:
-                                s += str[(int)strIndex];
+                                s += str[strIndex];
                             }
                             i = n + 1; // updates i to find + 1
                         }
@@ -4108,7 +4109,7 @@ QString QQuickTextInputPrivate::stripString(const QString &str) const
         return str;
 
     QString s;
-    int end = qMin(m_maxLength, (int)str.length());
+    int end = qMin(m_maxLength, str.length());
     for (int i = 0; i < end; ++i) {
         if (m_maskData[i].separator)
             s += m_maskData[i].maskChar;
@@ -4198,7 +4199,7 @@ void QQuickTextInputPrivate::internalRedo()
     if (!isRedoAvailable())
         return;
     internalDeselect();
-    while (m_undoState < (int)m_history.size()) {
+    while (m_undoState < m_history.size()) {
         Command& cmd = m_history[m_undoState++];
         switch (cmd.type) {
         case Insert:
@@ -4225,7 +4226,7 @@ void QQuickTextInputPrivate::internalRedo()
             m_cursor = cmd.pos;
             break;
         }
-        if (m_undoState < (int)m_history.size()) {
+        if (m_undoState < m_history.size()) {
             Command& next = m_history[m_undoState];
             if (next.type != cmd.type
                     && cmd.type < RemoveSelection
diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp
index d79d8ba3cd..a167f01484 100644
--- a/src/quick/items/qquickview.cpp
+++ b/src/quick/items/qquickview.cpp
@@ -48,29 +48,11 @@
 
 #include <QtQml/qqmlengine.h>
 #include <private/qqmlengine_p.h>
+#include <private/qv4qobjectwrapper_p.h>
 #include <QtCore/qbasictimer.h>
 
 QT_BEGIN_NAMESPACE
 
-DEFINE_OBJECT_VTABLE(QV4::QQuickRootItemMarker);
-
-QV4::Heap::QQuickRootItemMarker *QV4::QQuickRootItemMarker::create(QQmlEngine *engine, QQuickWindow *window)
-{
-    QV4::ExecutionEngine *e = QQmlEnginePrivate::getV4Engine(engine);
-    return e->memoryManager->allocObject<QQuickRootItemMarker>(window);
-}
-
-void QV4::QQuickRootItemMarker::markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine *e)
-{
-    QQuickItem *root = static_cast<QQuickRootItemMarker::Data *>(that)->window->contentItem();
-    if (root) {
-        QQuickItemPrivate *rootPrivate = QQuickItemPrivate::get(root);
-        rootPrivate->markObjects(e);
-    }
-
-    QV4::Object::markObjects(that, e);
-}
-
 void QQuickViewPrivate::init(QQmlEngine* e)
 {
     Q_Q(QQuickView);
@@ -84,10 +66,10 @@ void QQuickViewPrivate::init(QQmlEngine* e)
         engine.data()->setIncubationController(q->incubationController());
 
     {
+        // The content item has CppOwnership policy (set in QQuickWindow). Ensure the presence of a JS
+        // wrapper so that the garbage collector can see the policy.
         QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine.data());
-        QV4::Scope scope(v4);
-        QV4::Scoped<QV4::QQuickRootItemMarker> v(scope, QV4::QQuickRootItemMarker::create(engine.data(), q));
-        rootItemMarker.set(v4, v);
+        QV4::QObjectWrapper::wrap(v4, contentItem);
     }
 }
 
diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index 9c0d87984f..a090bdc9f7 100644
--- a/src/quick/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -108,38 +108,8 @@ public:
     QQuickView::ResizeMode resizeMode;
     QSize initialSize;
     QElapsedTimer frameTimer;
-    QV4::PersistentValue rootItemMarker;
 };
 
-namespace QV4 {
-namespace Heap {
-
-struct QQuickRootItemMarker : Object {
-    inline void init(QQuickWindow *window)
-    {
-        Object::init();
-        this->window = window;
-    }
-
-    QQuickWindow *window;
-};
-
-}
-
-struct QQuickRootItemMarker : public Object
-{
-    V4_OBJECT2(QQuickRootItemMarker, Object)
-
-    static Heap::QQuickRootItemMarker *create(QQmlEngine *engine, QQuickWindow *window);
-
-    static void markObjects(QV4::Heap::Base *that, QV4::ExecutionEngine *e);
-
-};
-
-
-
-}
-
 QT_END_NAMESPACE
 
 #endif // QQUICKVIEW_P_H
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 8cdc7955ff..8a90afe113 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -1808,6 +1808,7 @@ bool QQuickWindowPrivate::deliverWheelEvent(QQuickItem *item, QWheelEvent *event
     if (item->contains(p)) {
         QWheelEvent wheel(p, p, event->pixelDelta(), event->angleDelta(), event->delta(),
                           event->orientation(), event->buttons(), event->modifiers(), event->phase(), event->source(), event->inverted());
+        wheel.setTimestamp(event->timestamp());
         wheel.accept();
         QCoreApplication::sendEvent(item, &wheel);
         if (wheel.isAccepted()) {
@@ -1908,8 +1909,6 @@ void QQuickWindowPrivate::deliverDelayedTouchEvent()
     deliverPointerEvent(pointerEventInstance(e.data()));
 }
 
-static bool qquickwindow_no_touch_compression = qEnvironmentVariableIsSet("QML_NO_TOUCH_COMPRESSION");
-
 bool QQuickWindowPrivate::compressTouchEvent(QTouchEvent *event)
 {
     Q_Q(QQuickWindow);
@@ -1986,6 +1985,8 @@ void QQuickWindowPrivate::handleTouchEvent(QTouchEvent *event)
 
     qCDebug(DBG_TOUCH) << event;
 
+    static bool qquickwindow_no_touch_compression = qEnvironmentVariableIsSet("QML_NO_TOUCH_COMPRESSION");
+
     if (qquickwindow_no_touch_compression || pointerEventRecursionGuard) {
         deliverPointerEvent(pointerEventInstance(event));
         return;
@@ -2111,7 +2112,7 @@ void QQuickWindowPrivate::flushFrameSynchronousEvents()
     There is a unique instance per QQuickPointerDevice, which is determined
     from \a event's device.
 */
-QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QEvent *event)
+QQuickPointerEvent *QQuickWindowPrivate::pointerEventInstance(QEvent *event) const
 {
     QQuickPointerDevice *dev = nullptr;
     switch (event->type()) {
@@ -4202,6 +4203,28 @@ void QQuickWindow::resetOpenGLState()
  */
 
 /*!
+    \qmlproperty variant Window::targetScreen
+
+    Specifies the screen the window should be placed on. Equivalent to
+    QWindow::setScreen().
+
+    The value must be an element from the Qt.application.screens array.
+
+    By default the value is null which leads to using the primary screen.
+
+    \note To ensure that the window is associated with the desired screen right
+    upon the underlying native window's initial creation, make sure this
+    property is set as early as possible and that the setting of its value is
+    not deferred. This can be particularly important on embedded platforms
+    without a windowing system, where only one window per screen is allowed at a
+    time.
+
+    \since 5.9
+
+    \sa QWindow::setScreen(), QScreen, Qt.application
+ */
+
+/*!
     \qmlproperty Item Window::activeFocusItem
     \since 5.1
 
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index cfadadec2d..7e1e45f345 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -56,6 +56,7 @@ class QSGTexture;
 class QInputMethodEvent;
 class QQuickWindowPrivate;
 class QQuickWindowAttached;
+class QOpenGLContext;
 class QOpenGLFramebufferObject;
 class QQmlIncubationController;
 class QInputMethodEvent;
diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
index b13dda4ef8..cedfd765da 100644
--- a/src/quick/items/qquickwindow_p.h
+++ b/src/quick/items/qquickwindow_p.h
@@ -161,7 +161,7 @@ public:
     void deliverDelayedTouchEvent();
 
     // delivery of pointer events:
-    QQuickPointerEvent *pointerEventInstance(QEvent *ev);
+    QQuickPointerEvent *pointerEventInstance(QEvent *ev) const;
     void deliverPointerEvent(QQuickPointerEvent *);
     void deliverTouchEvent(QQuickPointerTouchEvent *);
     bool deliverTouchCancelEvent(QTouchEvent *);
@@ -198,7 +198,7 @@ public:
     void setFocusInScope(QQuickItem *scope, QQuickItem *item, Qt::FocusReason reason, FocusOptions = 0);
     void clearFocusInScope(QQuickItem *scope, QQuickItem *item, Qt::FocusReason reason, FocusOptions = 0);
     static void notifyFocusChangesRecur(QQuickItem **item, int remaining);
-    void clearFocusObject();
+    void clearFocusObject() override;
 
     void updateFocusItemTransform();
 
diff --git a/src/quick/items/qquickwindowmodule.cpp b/src/quick/items/qquickwindowmodule.cpp
index c624d162a9..ea1fc2f106 100644
--- a/src/quick/items/qquickwindowmodule.cpp
+++ b/src/quick/items/qquickwindowmodule.cpp
@@ -47,6 +47,7 @@
 
 #include <private/qguiapplication_p.h>
 #include <private/qqmlengine_p.h>
+#include <private/qv4qobjectwrapper_p.h>
 #include <qpa/qplatformintegration.h>
 
 QT_BEGIN_NAMESPACE
@@ -58,6 +59,7 @@ public:
         : complete(false)
         , visible(false)
         , visibility(QQuickWindow::AutomaticVisibility)
+        , targetScreen(nullptr)
     {
     }
 
@@ -65,6 +67,7 @@ public:
     bool visible;
     QQuickWindow::Visibility visibility;
     QV4::PersistentValue rootItemMarker;
+    QObject *targetScreen;
 };
 
 QQuickWindowQmlImpl::QQuickWindowQmlImpl(QWindow *parent)
@@ -104,12 +107,11 @@ void QQuickWindowQmlImpl::classBegin()
         if (e && !e->incubationController())
             e->setIncubationController(incubationController());
     }
-    Q_ASSERT(e);
     {
+        // The content item has CppOwnership policy (set in QQuickWindow). Ensure the presence of a JS
+        // wrapper so that the garbage collector can see the policy.
         QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(e);
-        QV4::Scope scope(v4);
-        QV4::ScopedObject v(scope, QV4::QQuickRootItemMarker::create(e, this));
-        d->rootItemMarker = v;
+        QV4::QObjectWrapper::wrap(v4, d->contentItem);
     }
 }
 
@@ -170,6 +172,26 @@ void QQuickWindowQmlImpl::setWindowVisibility()
     }
 }
 
+QObject *QQuickWindowQmlImpl::targetScreen() const
+{
+    Q_D(const QQuickWindowQmlImpl);
+    return d->targetScreen;
+}
+
+void QQuickWindowQmlImpl::setTargetScreen(QObject *screen)
+{
+    Q_D(QQuickWindowQmlImpl);
+    if (d->targetScreen != screen) {
+        d->targetScreen = screen;
+        emit targetScreenChanged();
+        QQuickScreenInfo *screenWrapper = qobject_cast<QQuickScreenInfo *>(screen);
+        if (screenWrapper)
+            setScreen(screenWrapper->wrappedScreen());
+        else
+            setScreen(nullptr);
+    }
+}
+
 void QQuickWindowModule::defineModule()
 {
     const char uri[] = "QtQuick.Window";
@@ -181,7 +203,10 @@ void QQuickWindowModule::defineModule()
     qmlRegisterRevision<QQuickWindow,2>(uri, 2, 2);
     qmlRegisterType<QQuickWindowQmlImpl>(uri, 2, 1, "Window");
     qmlRegisterType<QQuickWindowQmlImpl,1>(uri, 2, 2, "Window");
+    qmlRegisterType<QQuickWindowQmlImpl,2>(uri, 2, 3, "Window");
     qmlRegisterUncreatableType<QQuickScreen>(uri, 2, 0, "Screen", QStringLiteral("Screen can only be used via the attached property."));
+    qmlRegisterUncreatableType<QQuickScreen,1>(uri, 2, 3, "Screen", QStringLiteral("Screen can only be used via the attached property."));
+    qmlRegisterUncreatableType<QQuickScreenInfo,2>(uri, 2, 3, "ScreenInfo", QStringLiteral("ScreenInfo can only be used via the attached property."));
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick/items/qquickwindowmodule_p.h b/src/quick/items/qquickwindowmodule_p.h
index 8a6bbac412..7ca29880ea 100644
--- a/src/quick/items/qquickwindowmodule_p.h
+++ b/src/quick/items/qquickwindowmodule_p.h
@@ -67,6 +67,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickWindowQmlImpl : public QQuickWindow, public Q
 
     Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
     Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged)
+    Q_PROPERTY(QObject *targetScreen READ targetScreen WRITE setTargetScreen NOTIFY targetScreenChanged REVISION 2)
 
 public:
     QQuickWindowQmlImpl(QWindow *parent = Q_NULLPTR);
@@ -74,11 +75,15 @@ public:
     void setVisible(bool visible);
     void setVisibility(Visibility visibility);
 
+    QObject *targetScreen() const;
+    void setTargetScreen(QObject *screen);
+
     static QQuickWindowAttached *qmlAttachedProperties(QObject *object);
 
 Q_SIGNALS:
     void visibleChanged(bool arg);
     void visibilityChanged(QWindow::Visibility visibility);
+    Q_REVISION(2) void targetScreenChanged();
 
 protected:
     void classBegin() Q_DECL_OVERRIDE;
author	Shawn Rutledge <shawn.rutledge@qt.io>	2016-11-17 16:24:33 +0100
committer	Shawn Rutledge <shawn.rutledge@qt.io>	2016-11-17 16:24:33 +0100
commit	0beb79fb0e9ed814b3e9447ccd97a0c099af9e4b (patch)
tree	28f7411dc50f099ef0812c830525b4f50ed7ecf4 /src/quick/items
parent	12a3eff085bc7eb30a5283e32009d2899b464278 (diff)
parent	a7fd83cd0cecb789006baecabfc6a49c49b7f48c (diff)