Merge remote-tracking branch 'origin/5.14' into 5.15

 Conflicts:
	src/imports/qtquick2/plugins.qmltypes
	src/quick/items/qquickitemsmodule.cpp

Change-Id: I841c65c9c131354788b4f3fcfe3d7ed27be316d5

11 files changed, 673 insertions, 32 deletions

diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes
index c783c63caf..765c92fcb9 100644
--- a/src/imports/builtins/builtins.qmltypes
+++ b/src/imports/builtins/builtins.qmltypes
@@ -1685,6 +1685,17 @@ Module {
                 "ChecksumItuV41": 1
             }
         }
+        Enum {
+            name: "HighDpiScaleFactorRoundingPolicy"
+            values: {
+                "Unset": 0,
+                "Round": 1,
+                "Ceil": 2,
+                "Floor": 3,
+                "RoundPreferFloor": 4,
+                "PassThrough": 5
+            }
+        }
     }
     Component { name: "QEasingCurve"; prototype: "QQmlEasingValueType" }
 }
diff --git a/src/imports/folderlistmodel/plugins.qmltypes b/src/imports/folderlistmodel/plugins.qmltypes
index 0fdbae66d3..7c53c99665 100644
--- a/src/imports/folderlistmodel/plugins.qmltypes
+++ b/src/imports/folderlistmodel/plugins.qmltypes
@@ -9,6 +9,280 @@ import QtQuick.tooling 1.2
 Module {
     dependencies: ["QtQuick 2.0"]
     Component {
+        name: "QAbstractItemModel"
+        prototype: "QObject"
+        Enum {
+            name: "LayoutChangeHint"
+            values: {
+                "NoLayoutChangeHint": 0,
+                "VerticalSortHint": 1,
+                "HorizontalSortHint": 2
+            }
+        }
+        Enum {
+            name: "CheckIndexOption"
+            values: {
+                "NoOption": 0,
+                "IndexIsValid": 1,
+                "DoNotUseParent": 2,
+                "ParentIsInvalid": 4
+            }
+        }
+        Signal {
+            name: "dataChanged"
+            Parameter { name: "topLeft"; type: "QModelIndex" }
+            Parameter { name: "bottomRight"; type: "QModelIndex" }
+            Parameter { name: "roles"; type: "QVector<int>" }
+        }
+        Signal {
+            name: "dataChanged"
+            Parameter { name: "topLeft"; type: "QModelIndex" }
+            Parameter { name: "bottomRight"; type: "QModelIndex" }
+        }
+        Signal {
+            name: "headerDataChanged"
+            Parameter { name: "orientation"; type: "Qt::Orientation" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "layoutChanged"
+            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
+            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
+        }
+        Signal {
+            name: "layoutChanged"
+            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
+        }
+        Signal { name: "layoutChanged" }
+        Signal {
+            name: "layoutAboutToBeChanged"
+            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
+            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
+        }
+        Signal {
+            name: "layoutAboutToBeChanged"
+            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
+        }
+        Signal { name: "layoutAboutToBeChanged" }
+        Signal {
+            name: "rowsAboutToBeInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "rowsInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "rowsAboutToBeRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "rowsRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsAboutToBeInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsInserted"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsAboutToBeRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal {
+            name: "columnsRemoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "first"; type: "int" }
+            Parameter { name: "last"; type: "int" }
+        }
+        Signal { name: "modelAboutToBeReset" }
+        Signal { name: "modelReset" }
+        Signal {
+            name: "rowsAboutToBeMoved"
+            Parameter { name: "sourceParent"; type: "QModelIndex" }
+            Parameter { name: "sourceStart"; type: "int" }
+            Parameter { name: "sourceEnd"; type: "int" }
+            Parameter { name: "destinationParent"; type: "QModelIndex" }
+            Parameter { name: "destinationRow"; type: "int" }
+        }
+        Signal {
+            name: "rowsMoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+            Parameter { name: "destination"; type: "QModelIndex" }
+            Parameter { name: "row"; type: "int" }
+        }
+        Signal {
+            name: "columnsAboutToBeMoved"
+            Parameter { name: "sourceParent"; type: "QModelIndex" }
+            Parameter { name: "sourceStart"; type: "int" }
+            Parameter { name: "sourceEnd"; type: "int" }
+            Parameter { name: "destinationParent"; type: "QModelIndex" }
+            Parameter { name: "destinationColumn"; type: "int" }
+        }
+        Signal {
+            name: "columnsMoved"
+            Parameter { name: "parent"; type: "QModelIndex" }
+            Parameter { name: "start"; type: "int" }
+            Parameter { name: "end"; type: "int" }
+            Parameter { name: "destination"; type: "QModelIndex" }
+            Parameter { name: "column"; type: "int" }
+        }
+        Method { name: "submit"; type: "bool" }
+        Method { name: "revert" }
+        Method {
+            name: "hasIndex"
+            type: "bool"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "column"; type: "int" }
+            Parameter { name: "parent"; type: "QModelIndex" }
+        }
+        Method {
+            name: "hasIndex"
+            type: "bool"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "column"; type: "int" }
+        }
+        Method {
+            name: "index"
+            type: "QModelIndex"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "column"; type: "int" }
+            Parameter { name: "parent"; type: "QModelIndex" }
+        }
+        Method {
+            name: "index"
+            type: "QModelIndex"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "column"; type: "int" }
+        }
+        Method {
+            name: "parent"
+            type: "QModelIndex"
+            Parameter { name: "child"; type: "QModelIndex" }
+        }
+        Method {
+            name: "sibling"
+            type: "QModelIndex"
+            Parameter { name: "row"; type: "int" }
+            Parameter { name: "column"; type: "int" }
+            Parameter { name: "idx"; type: "QModelIndex" }
+        }
+        Method {
+            name: "rowCount"
+            type: "int"
+            Parameter { name: "parent"; type: "QModelIndex" }
+        }
+        Method { name: "rowCount"; type: "int" }
+        Method {
+            name: "columnCount"
+            type: "int"
+            Parameter { name: "parent"; type: "QModelIndex" }
+        }
+        Method { name: "columnCount"; type: "int" }
+        Method {
+            name: "hasChildren"
+            type: "bool"
+            Parameter { name: "parent"; type: "QModelIndex" }
+        }
+        Method { name: "hasChildren"; type: "bool" }
+        Method {
+            name: "data"
+            type: "QVariant"
+            Parameter { name: "index"; type: "QModelIndex" }
+            Parameter { name: "role"; type: "int" }
+        }
+        Method {
+            name: "data"
+            type: "QVariant"
+            Parameter { name: "index"; type: "QModelIndex" }
+        }
+        Method {
+            name: "setData"
+            type: "bool"
+            Parameter { name: "index"; type: "QModelIndex" }
+            Parameter { name: "value"; type: "QVariant" }
+            Parameter { name: "role"; type: "int" }
+        }
+        Method {
+            name: "setData"
+            type: "bool"
+            Parameter { name: "index"; type: "QModelIndex" }
+            Parameter { name: "value"; type: "QVariant" }
+        }
+        Method {
+            name: "headerData"
+            type: "QVariant"
+            Parameter { name: "section"; type: "int" }
+            Parameter { name: "orientation"; type: "Qt::Orientation" }
+            Parameter { name: "role"; type: "int" }
+        }
+        Method {
+            name: "headerData"
+            type: "QVariant"
+            Parameter { name: "section"; type: "int" }
+            Parameter { name: "orientation"; type: "Qt::Orientation" }
+        }
+        Method {
+            name: "fetchMore"
+            Parameter { name: "parent"; type: "QModelIndex" }
+        }
+        Method {
+            name: "canFetchMore"
+            type: "bool"
+            Parameter { name: "parent"; type: "QModelIndex" }
+        }
+        Method {
+            name: "flags"
+            type: "Qt::ItemFlags"
+            Parameter { name: "index"; type: "QModelIndex" }
+        }
+        Method {
+            name: "match"
+            type: "QModelIndexList"
+            Parameter { name: "start"; type: "QModelIndex" }
+            Parameter { name: "role"; type: "int" }
+            Parameter { name: "value"; type: "QVariant" }
+            Parameter { name: "hits"; type: "int" }
+            Parameter { name: "flags"; type: "Qt::MatchFlags" }
+        }
+        Method {
+            name: "match"
+            type: "QModelIndexList"
+            Parameter { name: "start"; type: "QModelIndex" }
+            Parameter { name: "role"; type: "int" }
+            Parameter { name: "value"; type: "QVariant" }
+            Parameter { name: "hits"; type: "int" }
+        }
+        Method {
+            name: "match"
+            type: "QModelIndexList"
+            Parameter { name: "start"; type: "QModelIndex" }
+            Parameter { name: "role"; type: "int" }
+            Parameter { name: "value"; type: "QVariant" }
+        }
+    }
+    Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
+    Component {
         name: "QQuickFolderListModel"
         prototype: "QAbstractListModel"
         exports: [
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index affb1e9fe2..f5acfd86b7 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -539,6 +539,8 @@ QStringList QQuickFolderListModel::nameFilters() const
 void QQuickFolderListModel::setNameFilters(const QStringList &filters)
 {
     Q_D(QQuickFolderListModel);
+    if (d->nameFilters == filters)
+        return;
     d->fileInfoThread.setNameFilters(filters);
     d->nameFilters = filters;
 }
@@ -731,6 +733,7 @@ void  QQuickFolderListModel::setShowDotAndDotDot(bool on)
 
     if (on != d->showDotAndDotDot) {
         d->fileInfoThread.setShowDotAndDotDot(on);
+        d->showDotAndDotDot = on;
     }
 }
 
@@ -756,6 +759,7 @@ void QQuickFolderListModel::setShowHidden(bool on)
 
     if (on != d->showHidden) {
         d->fileInfoThread.setShowHidden(on);
+        d->showHidden = on;
     }
 }
 
@@ -781,6 +785,7 @@ void QQuickFolderListModel::setShowOnlyReadable(bool on)
 
     if (on != d->showOnlyReadable) {
         d->fileInfoThread.setShowOnlyReadable(on);
+        d->showOnlyReadable = on;
     }
 }
 
@@ -805,6 +810,7 @@ void QQuickFolderListModel::setCaseSensitive(bool on)
 
     if (on != d->caseSensitive) {
         d->fileInfoThread.setCaseSensitive(on);
+        d->caseSensitive = on;
     }
 }
 
@@ -852,7 +858,7 @@ QQuickFolderListModel::Status QQuickFolderListModel::status() const
     \qmlproperty bool FolderListModel::sortCaseSensitive
     \since 5.12
 
-    If set to true, the sort is case sensitive. This property is true by default.
+    If set to \c true, the sort is case sensitive. This property is \c true by default.
 */
 
 bool QQuickFolderListModel::sortCaseSensitive() const
@@ -874,8 +880,8 @@ void QQuickFolderListModel::setSortCaseSensitive(bool on)
 /*!
     \qmlmethod var FolderListModel::get(int index, string property)
 
-    Get the folder property for the given index. The following properties
-    are available.
+    Returns the folder \a property for the given \a index. The following properties
+    are available:
 
     \list
         \li \c fileName
@@ -902,7 +908,7 @@ QVariant QQuickFolderListModel::get(int idx, const QString &property) const
     \qmlmethod int FolderListModel::indexOf(url file)
     \since 5.6
 
-    Get the index of the given file URL if the model contains it,
+    Returns the index of the given \a file URL if the model contains it,
     or -1 if not.
 */
 int QQuickFolderListModel::indexOf(const QUrl &file) const
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index a87b0a59f6..9973883024 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -28,6 +28,6 @@ qtHaveModule(quick) {
     qtConfig(quick-particles): \
         SUBDIRS += particles
 
-    qtConfig(quick-path):qtConfig(thread): SUBDIRS += shapes
+    qtConfig(quick-path): SUBDIRS += shapes
 }
 
diff --git a/src/imports/labsanimation/plugins.qmltypes b/src/imports/labsanimation/plugins.qmltypes
index 065e65ad7a..2ecc5e6f5d 100644
--- a/src/imports/labsanimation/plugins.qmltypes
+++ b/src/imports/labsanimation/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable Qt.labs.animation 1.0'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt.labs.animation 1.0'
 
 Module {
-    dependencies: ["QtQuick 2.0"]
+    dependencies: []
     Component {
         name: "QQuickBoundaryRule"
         prototype: "QObject"
diff --git a/src/imports/models/plugins.qmltypes b/src/imports/models/plugins.qmltypes
index 0f8814d0cd..89a839e502 100644
--- a/src/imports/models/plugins.qmltypes
+++ b/src/imports/models/plugins.qmltypes
@@ -484,6 +484,58 @@ Module {
     }
     Component { name: "QQmlDelegateModelParts"; prototype: "QObject" }
     Component {
+        name: "QQmlInstanceModel"
+        prototype: "QObject"
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Signal {
+            name: "modelUpdated"
+            Parameter { name: "changeSet"; type: "QQmlChangeSet" }
+            Parameter { name: "reset"; type: "bool" }
+        }
+        Signal {
+            name: "createdItem"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+        Signal {
+            name: "initItem"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+        Signal {
+            name: "destroyingItem"
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QQmlInstantiator"
+        defaultProperty: "delegate"
+        prototype: "QObject"
+        exports: ["QtQml.Models/Instantiator 2.14"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "active"; type: "bool" }
+        Property { name: "asynchronous"; type: "bool" }
+        Property { name: "model"; type: "QVariant" }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "object"; type: "QObject"; isReadonly: true; isPointer: true }
+        Signal {
+            name: "objectAdded"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+        Signal {
+            name: "objectRemoved"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+        Method {
+            name: "objectAt"
+            type: "QObject*"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component {
         name: "QQmlListElement"
         prototype: "QObject"
         exports: ["QtQml.Models/ListElement 2.1"]
diff --git a/src/imports/particles/plugins.qmltypes b/src/imports/particles/plugins.qmltypes
index 4a11658f1f..48da0b26ed 100644
--- a/src/imports/particles/plugins.qmltypes
+++ b/src/imports/particles/plugins.qmltypes
@@ -1081,6 +1081,56 @@ Module {
         }
     }
     Component {
+        name: "QQuickStochasticState"
+        prototype: "QObject"
+        Property { name: "duration"; type: "int" }
+        Property { name: "durationVariation"; type: "int" }
+        Property { name: "randomStart"; type: "bool" }
+        Property { name: "to"; type: "QVariantMap" }
+        Property { name: "name"; type: "string" }
+        Signal {
+            name: "durationChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "nameChanged"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Signal {
+            name: "toChanged"
+            Parameter { name: "arg"; type: "QVariantMap" }
+        }
+        Signal {
+            name: "durationVariationChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal { name: "entered" }
+        Signal {
+            name: "randomStartChanged"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Method {
+            name: "setDuration"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setName"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setTo"
+            Parameter { name: "arg"; type: "QVariantMap" }
+        }
+        Method {
+            name: "setDurationVariation"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setRandomStart"
+            Parameter { name: "arg"; type: "bool" }
+        }
+    }
+    Component {
         name: "QQuickTargetDirection"
         prototype: "QQuickDirection"
         exports: ["QtQuick.Particles/TargetDirection 2.0"]
diff --git a/src/imports/qtqml/plugins.qmltypes b/src/imports/qtqml/plugins.qmltypes
index ea8ef2b190..e4ddb3ddd1 100644
--- a/src/imports/qtqml/plugins.qmltypes
+++ b/src/imports/qtqml/plugins.qmltypes
@@ -10,8 +10,8 @@ Module {
     dependencies: []
     Component {
         name: "QObject"
-        exports: ["QML/QtObject 1.0", "QtQml/QtObject 2.0"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: ["QtQml/QtObject 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "objectName"; type: "string" }
         Signal {
             name: "objectNameChanged"
@@ -52,8 +52,8 @@ Module {
     Component {
         name: "QQmlComponent"
         prototype: "QObject"
-        exports: ["QML/Component 1.0", "QtQml/Component 2.0"]
-        exportMetaObjectRevisions: [0, 0]
+        exports: ["QtQml/Component 2.0"]
+        exportMetaObjectRevisions: [0]
         attachedType: "QQmlComponentAttached"
         Enum {
             name: "CompilationMode"
@@ -242,18 +242,4 @@ Module {
         Method { name: "stop" }
         Method { name: "restart" }
     }
-    Component {
-        name: "QQuickMouseEvent"
-        prototype: "QObject"
-        Property { name: "x"; type: "double"; isReadonly: true }
-        Property { name: "y"; type: "double"; isReadonly: true }
-        Property { name: "button"; type: "int"; isReadonly: true }
-        Property { name: "buttons"; type: "int"; isReadonly: true }
-        Property { name: "modifiers"; type: "int"; isReadonly: true }
-        Property { name: "source"; revision: 7; type: "int"; isReadonly: true }
-        Property { name: "wasHeld"; type: "bool"; isReadonly: true }
-        Property { name: "isClick"; type: "bool"; isReadonly: true }
-        Property { name: "accepted"; type: "bool" }
-        Property { name: "flags"; revision: 11; type: "int"; isReadonly: true }
-    }
 }
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 89d2f45f00..a773a8c428 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -449,6 +449,22 @@ Module {
         }
     }
     Component {
+        name: "QObject"
+        exports: ["QtQuick/QtObject 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "objectName"; type: "string" }
+        Signal {
+            name: "objectNameChanged"
+            Parameter { name: "objectName"; type: "string" }
+        }
+        Method { name: "toString" }
+        Method { name: "destroy" }
+        Method {
+            name: "destroy"
+            Parameter { name: "delay"; type: "int" }
+        }
+    }
+    Component {
         name: "QPointingDeviceUniqueId"
         exports: ["QtQuick/PointingDeviceUniqueId 2.9"]
         isCreatable: false
@@ -482,6 +498,92 @@ Module {
         }
     }
     Component {
+        name: "QQmlBind"
+        prototype: "QObject"
+        exports: ["QtQuick/Binding 2.0", "QtQuick/Binding 2.8"]
+        exportMetaObjectRevisions: [0, 8]
+        Enum {
+            name: "RestorationMode"
+            values: {
+                "RestoreNone": 0,
+                "RestoreBinding": 1,
+                "RestoreValue": 2,
+                "RestoreBindingOrValue": 3
+            }
+        }
+        Property { name: "target"; type: "QObject"; isPointer: true }
+        Property { name: "property"; type: "string" }
+        Property { name: "value"; type: "QVariant" }
+        Property { name: "when"; type: "bool" }
+        Property { name: "delayed"; revision: 8; type: "bool" }
+        Property { name: "restoreMode"; revision: 14; type: "RestorationMode" }
+    }
+    Component {
+        name: "QQmlComponent"
+        prototype: "QObject"
+        exports: ["QtQuick/Component 2.0"]
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQmlComponentAttached"
+        Enum {
+            name: "CompilationMode"
+            values: {
+                "PreferSynchronous": 0,
+                "Asynchronous": 1
+            }
+        }
+        Enum {
+            name: "Status"
+            values: {
+                "Null": 0,
+                "Ready": 1,
+                "Loading": 2,
+                "Error": 3
+            }
+        }
+        Property { name: "progress"; type: "double"; isReadonly: true }
+        Property { name: "status"; type: "Status"; isReadonly: true }
+        Property { name: "url"; type: "QUrl"; isReadonly: true }
+        Signal {
+            name: "statusChanged"
+            Parameter { type: "QQmlComponent::Status" }
+        }
+        Signal {
+            name: "progressChanged"
+            Parameter { type: "double" }
+        }
+        Method {
+            name: "loadUrl"
+            Parameter { name: "url"; type: "QUrl" }
+        }
+        Method {
+            name: "loadUrl"
+            Parameter { name: "url"; type: "QUrl" }
+            Parameter { name: "mode"; type: "CompilationMode" }
+        }
+        Method {
+            name: "setData"
+            Parameter { type: "QByteArray" }
+            Parameter { name: "baseUrl"; type: "QUrl" }
+        }
+        Method { name: "errorString"; type: "string" }
+    }
+    Component {
+        name: "QQmlComponentAttached"
+        prototype: "QObject"
+        Signal { name: "completed" }
+        Signal { name: "destruction" }
+    }
+    Component {
+        name: "QQmlConnections"
+        prototype: "QObject"
+        exports: ["QtQuick/Connections 2.0", "QtQuick/Connections 2.7"]
+        exportMetaObjectRevisions: [0, 3]
+        Property { name: "target"; type: "QObject"; isPointer: true }
+        Property { name: "enabled"; revision: 3; type: "bool" }
+        Property { name: "ignoreUnknownSignals"; type: "bool" }
+        Signal { name: "enabledChanged"; revision: 3 }
+    }
+    Component {
         name: "QQmlDelegateModel"
         defaultProperty: "delegate"
         prototype: "QQmlInstanceModel"
@@ -634,6 +736,58 @@ Module {
         Property { name: "bezierCurve"; type: "QVariantList" }
     }
     Component {
+        name: "QQmlInstanceModel"
+        prototype: "QObject"
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Signal {
+            name: "modelUpdated"
+            Parameter { name: "changeSet"; type: "QQmlChangeSet" }
+            Parameter { name: "reset"; type: "bool" }
+        }
+        Signal {
+            name: "createdItem"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+        Signal {
+            name: "initItem"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+        Signal {
+            name: "destroyingItem"
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+    }
+    Component {
+        name: "QQmlInstantiator"
+        defaultProperty: "delegate"
+        prototype: "QObject"
+        exports: ["QtQuick/Instantiator 2.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "active"; type: "bool" }
+        Property { name: "asynchronous"; type: "bool" }
+        Property { name: "model"; type: "QVariant" }
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "object"; type: "QObject"; isReadonly: true; isPointer: true }
+        Signal {
+            name: "objectAdded"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+        Signal {
+            name: "objectRemoved"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+        Method {
+            name: "objectAt"
+            type: "QObject*"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component {
         name: "QQmlListElement"
         prototype: "QObject"
         exports: ["QtQuick/ListElement 2.0"]
@@ -733,6 +887,70 @@ Module {
         Method { name: "sync" }
     }
     Component {
+        name: "QQmlLocale"
+        exports: ["QtQuick/Locale 2.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "MeasurementSystem"
+            values: {
+                "MetricSystem": 0,
+                "ImperialSystem": 1,
+                "ImperialUSSystem": 1,
+                "ImperialUKSystem": 2
+            }
+        }
+        Enum {
+            name: "FormatType"
+            values: {
+                "LongFormat": 0,
+                "ShortFormat": 1,
+                "NarrowFormat": 2
+            }
+        }
+        Enum {
+            name: "CurrencySymbolFormat"
+            values: {
+                "CurrencyIsoCode": 0,
+                "CurrencySymbol": 1,
+                "CurrencyDisplayName": 2
+            }
+        }
+        Enum {
+            name: "DayOfWeek"
+            values: {
+                "Sunday": 0,
+                "Monday": 1,
+                "Tuesday": 2,
+                "Wednesday": 3,
+                "Thursday": 4,
+                "Friday": 5,
+                "Saturday": 6
+            }
+        }
+    }
+    Component {
+        name: "QQmlLoggingCategory"
+        prototype: "QObject"
+        exports: [
+            "QtQuick/LoggingCategory 2.12",
+            "QtQuick/LoggingCategory 2.8"
+        ]
+        exportMetaObjectRevisions: [12, 0]
+        Enum {
+            name: "DefaultLogLevel"
+            values: {
+                "Debug": 0,
+                "Info": 4,
+                "Warning": 1,
+                "Critical": 2,
+                "Fatal": 3
+            }
+        }
+        Property { name: "name"; type: "string" }
+        Property { name: "defaultLogLevel"; revision: 12; type: "DefaultLogLevel" }
+    }
+    Component {
         name: "QQmlObjectModel"
         defaultProperty: "children"
         prototype: "QQmlInstanceModel"
@@ -789,6 +1007,21 @@ Module {
         Property { name: "index"; type: "int"; isReadonly: true }
     }
     Component {
+        name: "QQmlTimer"
+        prototype: "QObject"
+        exports: ["QtQuick/Timer 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "interval"; type: "int" }
+        Property { name: "running"; type: "bool" }
+        Property { name: "repeat"; type: "bool" }
+        Property { name: "triggeredOnStart"; type: "bool" }
+        Property { name: "parent"; type: "QObject"; isReadonly: true; isPointer: true }
+        Signal { name: "triggered" }
+        Method { name: "start" }
+        Method { name: "stop" }
+        Method { name: "restart" }
+    }
+    Component {
         name: "QQuickAbstractAnimation"
         prototype: "QObject"
         exports: ["QtQuick/Animation 2.0", "QtQuick/Animation 2.12"]
@@ -1569,8 +1802,8 @@ Module {
     Component {
         name: "QQuickDragHandler"
         prototype: "QQuickMultiPointHandler"
-        exports: ["QtQuick/DragHandler 2.12"]
-        exportMetaObjectRevisions: [12]
+        exports: ["QtQuick/DragHandler 2.12", "QtQuick/DragHandler 2.14"]
+        exportMetaObjectRevisions: [12, 14]
         Enum {
             name: "SnapMode"
             values: {
@@ -1583,7 +1816,8 @@ Module {
         Property { name: "xAxis"; type: "QQuickDragAxis"; isReadonly: true; isPointer: true }
         Property { name: "yAxis"; type: "QQuickDragAxis"; isReadonly: true; isPointer: true }
         Property { name: "translation"; type: "QVector2D"; isReadonly: true }
-        Property { name: "snapMode"; type: "SnapMode" }
+        Property { name: "snapMode"; revision: 14; type: "SnapMode" }
+        Signal { name: "snapModeChanged"; revision: 14 }
     }
     Component {
         name: "QQuickDropArea"
@@ -2282,12 +2516,13 @@ Module {
             "QtQuick/Image 2.0",
             "QtQuick/Image 2.1",
             "QtQuick/Image 2.11",
+            "QtQuick/Image 2.14",
             "QtQuick/Image 2.3",
             "QtQuick/Image 2.4",
             "QtQuick/Image 2.5",
             "QtQuick/Image 2.7"
         ]
-        exportMetaObjectRevisions: [0, 1, 11, 3, 4, 5, 7]
+        exportMetaObjectRevisions: [0, 1, 11, 14, 3, 4, 5, 7]
         Enum {
             name: "HAlignment"
             values: {
@@ -2343,6 +2578,9 @@ Module {
         name: "QQuickImageBase"
         defaultProperty: "data"
         prototype: "QQuickImplicitSizeItem"
+        exports: ["QtQuick/ImageBase 2.14"]
+        isCreatable: false
+        exportMetaObjectRevisions: [14]
         Enum {
             name: "Status"
             values: {
@@ -2359,6 +2597,8 @@ Module {
         Property { name: "cache"; type: "bool" }
         Property { name: "sourceSize"; type: "QSize" }
         Property { name: "mirror"; type: "bool" }
+        Property { name: "currentFrame"; revision: 14; type: "int" }
+        Property { name: "frameCount"; revision: 14; type: "int"; isReadonly: true }
         Signal {
             name: "sourceChanged"
             Parameter { type: "QUrl" }
@@ -2371,6 +2611,8 @@ Module {
             name: "progressChanged"
             Parameter { name: "progress"; type: "double" }
         }
+        Signal { name: "currentFrameChanged"; revision: 14 }
+        Signal { name: "frameCountChanged"; revision: 14 }
     }
     Component {
         name: "QQuickImplicitSizeItem"
@@ -3189,6 +3431,20 @@ Module {
         Signal { name: "pressAndHoldIntervalChanged"; revision: 9 }
     }
     Component {
+        name: "QQuickMouseEvent"
+        prototype: "QObject"
+        Property { name: "x"; type: "double"; isReadonly: true }
+        Property { name: "y"; type: "double"; isReadonly: true }
+        Property { name: "button"; type: "int"; isReadonly: true }
+        Property { name: "buttons"; type: "int"; isReadonly: true }
+        Property { name: "modifiers"; type: "int"; isReadonly: true }
+        Property { name: "source"; revision: 7; type: "int"; isReadonly: true }
+        Property { name: "wasHeld"; type: "bool"; isReadonly: true }
+        Property { name: "isClick"; type: "bool"; isReadonly: true }
+        Property { name: "accepted"; type: "bool" }
+        Property { name: "flags"; revision: 11; type: "int"; isReadonly: true }
+    }
+    Component {
         name: "QQuickMultiPointHandler"
         prototype: "QQuickPointerDeviceHandler"
         Property { name: "minimumPointCount"; type: "int" }
@@ -3535,7 +3791,7 @@ Module {
         exports: ["QtQuick/PathMultiline 2.14"]
         exportMetaObjectRevisions: [14]
         Property { name: "start"; type: "QPointF"; isReadonly: true }
-        Property { name: "paths"; type: "QVariantList" }
+        Property { name: "paths"; type: "QVariant" }
     }
     Component {
         name: "QQuickPathPercent"
@@ -3550,7 +3806,7 @@ Module {
         exports: ["QtQuick/PathPolyline 2.14"]
         exportMetaObjectRevisions: [14]
         Property { name: "start"; type: "QPointF"; isReadonly: true }
-        Property { name: "path"; type: "QVariantList" }
+        Property { name: "path"; type: "QVariant" }
     }
     Component {
         name: "QQuickPathQuad"
diff --git a/src/imports/settings/qqmlsettings.cpp b/src/imports/settings/qqmlsettings.cpp
index 287a70363a..d43f9bafb7 100644
--- a/src/imports/settings/qqmlsettings.cpp
+++ b/src/imports/settings/qqmlsettings.cpp
@@ -473,7 +473,7 @@ QVariant QQmlSettings::value(const QString &key, const QVariant &defaultValue) c
 /*!
    \qmlmethod Settings::setValue(string key, var value)
 
-   Sets the value of setting key to value. If the key already exists,
+   Sets the value of setting \a key to \a value. If the key already exists,
    the previous value is overwritten.
 
    \since Qt 5.12
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes
index d9a9b432a2..5d6cf33f4f 100644
--- a/src/imports/window/plugins.qmltypes
+++ b/src/imports/window/plugins.qmltypes
@@ -104,6 +104,12 @@ Module {
                 "NativeTextRendering": 1
             }
         }
+        Enum {
+            name: "NativeObjectType"
+            values: {
+                "NativeObjectTexture": 0
+            }
+        }
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "color"; type: "QColor" }
         Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }