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

Change-Id: I22cb14c061dc1738fd711756a6bcabd4a25be915

15 files changed, 278 insertions, 1283 deletions

diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes
index cca1c20d54..88e3ac6634 100644
--- a/src/imports/builtins/builtins.qmltypes
+++ b/src/imports/builtins/builtins.qmltypes
@@ -198,9 +198,7 @@ Module {
                 "MacWindowToolBarButtonHint": 268435456,
                 "BypassGraphicsProxyWidget": 536870912,
                 "NoDropShadowWindowHint": 1073741824,
-                "WindowFullscreenButtonHint": -2147483648,
-                "WindowOkButtonHint": 524288,
-                "WindowCancelButtonHint": 1048576
+                "WindowFullscreenButtonHint": -2147483648
             }
         }
         Enum {
@@ -243,9 +241,7 @@ Module {
                 "MacWindowToolBarButtonHint": 268435456,
                 "BypassGraphicsProxyWidget": 536870912,
                 "NoDropShadowWindowHint": 1073741824,
-                "WindowFullscreenButtonHint": -2147483648,
-                "WindowOkButtonHint": 524288,
-                "WindowCancelButtonHint": 1048576
+                "WindowFullscreenButtonHint": -2147483648
             }
         }
         Enum {
@@ -422,6 +418,7 @@ Module {
                 "AA_DontShowIconsInMenus": 2,
                 "AA_NativeWindows": 3,
                 "AA_DontCreateNativeWidgetSiblings": 4,
+                "AA_PluginApplication": 5,
                 "AA_MacPluginApplication": 5,
                 "AA_DontUseNativeMenuBar": 6,
                 "AA_MacDontSwapCtrlAndMeta": 7,
@@ -438,7 +435,12 @@ Module {
                 "AA_SetPalette": 19,
                 "AA_EnableHighDpiScaling": 20,
                 "AA_DisableHighDpiScaling": 21,
-                "AA_AttributeCount": 22
+                "AA_UseStyleSheetPropagationInWidgetStyles": 22,
+                "AA_DontUseNativeDialogs": 23,
+                "AA_SynthesizeMouseForUnhandledTabletEvents": 24,
+                "AA_CompressHighFrequencyEvents": 25,
+                "AA_DontCheckOpenGLContextThreadAffinity": 26,
+                "AA_AttributeCount": 27
             }
         }
         Enum {
@@ -1274,8 +1276,10 @@ Module {
                 "ImTextBeforeCursor": 2048,
                 "ImTextAfterCursor": 4096,
                 "ImEnterKeyType": 8192,
+                "ImAnchorRectangle": 16384,
+                "ImInputItemClipRectangle": 32768,
                 "ImPlatformData": -2147483648,
-                "ImQueryInput": 186,
+                "ImQueryInput": 16570,
                 "ImQueryAll": -1
             }
         }
@@ -1297,8 +1301,10 @@ Module {
                 "ImTextBeforeCursor": 2048,
                 "ImTextAfterCursor": 4096,
                 "ImEnterKeyType": 8192,
+                "ImAnchorRectangle": 16384,
+                "ImInputItemClipRectangle": 32768,
                 "ImPlatformData": -2147483648,
-                "ImQueryInput": 186,
+                "ImQueryInput": 16570,
                 "ImQueryAll": -1
             }
         }
@@ -1579,6 +1585,7 @@ Module {
         Enum {
             name: "ScrollPhase"
             values: {
+                "NoScrollPhase": 0,
                 "ScrollBegin": 1,
                 "ScrollUpdate": 2,
                 "ScrollEnd": 3
diff --git a/src/imports/folderlistmodel/plugins.qmltypes b/src/imports/folderlistmodel/plugins.qmltypes
index 02127c63cb..e77b633932 100644
--- a/src/imports/folderlistmodel/plugins.qmltypes
+++ b/src/imports/folderlistmodel/plugins.qmltypes
@@ -4,284 +4,20 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable Qt.labs.folderlistmodel 2.1'
+// 'qmlplugindump -nonrelocatable Qt.labs.folderlistmodel 2.2'
 
 Module {
-    dependencies: []
-    Component {
-        name: "QAbstractItemModel"
-        prototype: "QObject"
-        Enum {
-            name: "LayoutChangeHint"
-            values: {
-                "NoLayoutChangeHint": 0,
-                "VerticalSortHint": 1,
-                "HorizontalSortHint": 2
-            }
-        }
-        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" }
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "QQuickFolderListModel"
         prototype: "QAbstractListModel"
         exports: [
             "Qt.labs.folderlistmodel/FolderListModel 1.0",
             "Qt.labs.folderlistmodel/FolderListModel 2.0",
-            "Qt.labs.folderlistmodel/FolderListModel 2.1"
+            "Qt.labs.folderlistmodel/FolderListModel 2.1",
+            "Qt.labs.folderlistmodel/FolderListModel 2.2"
         ]
-        exportMetaObjectRevisions: [0, 0, 1]
+        exportMetaObjectRevisions: [0, 0, 1, 2]
         Enum {
             name: "SortField"
             values: {
@@ -304,6 +40,7 @@ Module {
         Property { name: "showDotAndDotDot"; type: "bool" }
         Property { name: "showHidden"; revision: 1; type: "bool" }
         Property { name: "showOnlyReadable"; type: "bool" }
+        Property { name: "caseSensitive"; revision: 2; type: "bool" }
         Property { name: "count"; type: "int"; isReadonly: true }
         Signal { name: "rowCountChanged" }
         Signal { name: "countChanged"; revision: 1 }
diff --git a/src/imports/layouts/plugins.qmltypes b/src/imports/layouts/plugins.qmltypes
index b130215b62..afb563391d 100644
--- a/src/imports/layouts/plugins.qmltypes
+++ b/src/imports/layouts/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 QtQuick.Layouts 1.2'
+// 'qmlplugindump -nonrelocatable QtQuick.Layouts 1.3'
 
 Module {
-    dependencies: []
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "QQuickColumnLayout"
         defaultProperty: "data"
diff --git a/src/imports/layouts/qquicklayout.cpp b/src/imports/layouts/qquicklayout.cpp
index 98e2aea44f..07ada75a5f 100644
--- a/src/imports/layouts/qquicklayout.cpp
+++ b/src/imports/layouts/qquicklayout.cpp
@@ -698,6 +698,10 @@ QQuickLayout::QQuickLayout(QQuickLayoutPrivate &dd, QQuickItem *parent)
 QQuickLayout::~QQuickLayout()
 {
     d_func()->m_isReady = false;
+
+    const auto childItems = d_func()->childItems;
+    for (QQuickItem *child : childItems)
+        QQuickItemPrivate::get(child)->removeItemChangeListener(this, QQuickItemPrivate::SiblingOrder);
 }
 
 QQuickLayoutAttached *QQuickLayout::qmlAttachedProperties(QObject *object)
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index 7d96f11768..bf70fd1050 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -110,20 +110,31 @@ namespace QV4 {
 namespace Heap {
     struct QQmlSqlDatabaseWrapper : public Object {
         enum Type { Database, Query, Rows };
-        QQmlSqlDatabaseWrapper()
+        void init()
         {
+            Object::init();
             type = Database;
+            database = new QSqlDatabase;
+            version = new QString;
+            sqlQuery = new QSqlQuery;
+        }
+
+        void destroy() {
+            delete database;
+            delete version;
+            delete sqlQuery;
+            Object::destroy();
         }
 
         Type type;
-        QSqlDatabase database;
+        QSqlDatabase *database;
 
-        QString version; // type == Database
+        QString *version; // type == Database
 
         bool inTransaction; // type == Query
         bool readonly;   // type == Query
 
-        QSqlQuery sqlQuery; // type == Rows
+        QSqlQuery *sqlQuery; // type == Rows
         bool forwardOnly; // type == Rows
     };
 }
@@ -160,7 +171,7 @@ static ReturnedValue qmlsqldatabase_version(CallContext *ctx)
     if (!r || r->d()->type != Heap::QQmlSqlDatabaseWrapper::Database)
         V4THROW_REFERENCE("Not a SQLDatabase object");
 
-    return Encode(scope.engine->newString(r->d()->version));
+    return Encode(scope.engine->newString(*r->d()->version));
 }
 
 static ReturnedValue qmlsqldatabase_rows_length(CallContext *ctx)
@@ -170,11 +181,11 @@ static ReturnedValue qmlsqldatabase_rows_length(CallContext *ctx)
     if (!r || r->d()->type != Heap::QQmlSqlDatabaseWrapper::Rows)
         V4THROW_REFERENCE("Not a SQLDatabase::Rows object");
 
-    int s = r->d()->sqlQuery.size();
+    int s = r->d()->sqlQuery->size();
     if (s < 0) {
         // Inefficient
-        if (r->d()->sqlQuery.last()) {
-            s = r->d()->sqlQuery.at() + 1;
+        if (r->d()->sqlQuery->last()) {
+            s = r->d()->sqlQuery->at() + 1;
         } else {
             s = 0;
         }
@@ -188,7 +199,7 @@ static ReturnedValue qmlsqldatabase_rows_forwardOnly(CallContext *ctx)
     QV4::Scoped<QQmlSqlDatabaseWrapper> r(scope, ctx->thisObject().as<QQmlSqlDatabaseWrapper>());
     if (!r || r->d()->type != Heap::QQmlSqlDatabaseWrapper::Rows)
         V4THROW_REFERENCE("Not a SQLDatabase::Rows object");
-    return Encode(r->d()->sqlQuery.isForwardOnly());
+    return Encode(r->d()->sqlQuery->isForwardOnly());
 }
 
 static ReturnedValue qmlsqldatabase_rows_setForwardOnly(CallContext *ctx)
@@ -200,7 +211,7 @@ static ReturnedValue qmlsqldatabase_rows_setForwardOnly(CallContext *ctx)
     if (ctx->argc() < 1)
         return ctx->engine()->throwTypeError();
 
-    r->d()->sqlQuery.setForwardOnly(ctx->args()[0].toBoolean());
+    r->d()->sqlQuery->setForwardOnly(ctx->args()[0].toBoolean());
     return Encode::undefined();
 }
 
@@ -230,8 +241,8 @@ static ReturnedValue qmlsqldatabase_rows_index(const QQmlSqlDatabaseWrapper *r,
 {
     Scope scope(v4);
 
-    if (r->d()->sqlQuery.at() == (int)index || r->d()->sqlQuery.seek(index)) {
-        QSqlRecord record = r->d()->sqlQuery.record();
+    if (r->d()->sqlQuery->at() == (int)index || r->d()->sqlQuery->seek(index)) {
+        QSqlRecord record = r->d()->sqlQuery->record();
         // XXX optimize
         ScopedObject row(scope, v4->newObject());
         for (int ii = 0; ii < record.count(); ++ii) {
@@ -289,7 +300,7 @@ static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
     if (!r->d()->inTransaction)
         V4THROW_SQL(SQLEXCEPTION_DATABASE_ERR,QQmlEngine::tr("executeSql called outside transaction()"));
 
-    QSqlDatabase db = r->d()->database;
+    QSqlDatabase db = *r->d()->database;
 
     QString sql = ctx->argc() ? ctx->args()[0].toQString() : QString();
 
@@ -338,8 +349,8 @@ static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
             QV4::ScopedObject p(scope, databaseData(scope.engine)->rowsProto.value());
             rows->setPrototype(p.getPointer());
             rows->d()->type = Heap::QQmlSqlDatabaseWrapper::Rows;
-            rows->d()->database = db;
-            rows->d()->sqlQuery = query;
+            *rows->d()->database = db;
+            *rows->d()->sqlQuery = query;
 
             ScopedObject resultObject(scope, scope.engine->newObject());
             result = resultObject.asReturnedValue();
@@ -401,20 +412,20 @@ static ReturnedValue qmlsqldatabase_changeVersion(CallContext *ctx)
     if (!r || r->d()->type != Heap::QQmlSqlDatabaseWrapper::Database)
         V4THROW_REFERENCE("Not a SQLDatabase object");
 
-    QSqlDatabase db = r->d()->database;
+    QSqlDatabase db = *r->d()->database;
     QString from_version = ctx->args()[0].toQString();
     QString to_version = ctx->args()[1].toQString();
     ScopedFunctionObject callback(scope, ctx->argument(2));
 
-    if (from_version != r->d()->version)
-        V4THROW_SQL(SQLEXCEPTION_VERSION_ERR, QQmlEngine::tr("Version mismatch: expected %1, found %2").arg(from_version).arg(r->d()->version));
+    if (from_version != *r->d()->version)
+        V4THROW_SQL(SQLEXCEPTION_VERSION_ERR, QQmlEngine::tr("Version mismatch: expected %1, found %2").arg(from_version).arg(*r->d()->version));
 
     Scoped<QQmlSqlDatabaseWrapper> w(scope, QQmlSqlDatabaseWrapper::create(scope.engine));
     ScopedObject p(scope, databaseData(scope.engine)->queryProto.value());
     w->setPrototype(p.getPointer());
     w->d()->type = Heap::QQmlSqlDatabaseWrapper::Query;
-    w->d()->database = db;
-    w->d()->version = r->d()->version;
+    *w->d()->database = db;
+    *w->d()->version = *r->d()->version;
 
     bool ok = true;
     if (!!callback) {
@@ -437,7 +448,7 @@ static ReturnedValue qmlsqldatabase_changeVersion(CallContext *ctx)
     }
 
     if (ok) {
-        w->d()->version = to_version;
+        *w->d()->version = to_version;
 #ifndef QT_NO_SETTINGS
         QSettings ini(qmlsqldatabase_databaseFile(db.connectionName(), scope.engine) + QLatin1String(".ini"), QSettings::IniFormat);
         ini.setValue(QLatin1String("Version"), to_version);
@@ -458,14 +469,14 @@ static ReturnedValue qmlsqldatabase_transaction_shared(CallContext *ctx, bool re
     if (!callback)
         V4THROW_SQL(SQLEXCEPTION_UNKNOWN_ERR, QQmlEngine::tr("transaction: missing callback"));
 
-    QSqlDatabase db = r->d()->database;
+    QSqlDatabase db = *r->d()->database;
 
     Scoped<QQmlSqlDatabaseWrapper> w(scope, QQmlSqlDatabaseWrapper::create(scope.engine));
     QV4::ScopedObject p(scope, databaseData(scope.engine)->queryProto.value());
     w->setPrototype(p.getPointer());
     w->d()->type = Heap::QQmlSqlDatabaseWrapper::Query;
-    w->d()->database = db;
-    w->d()->version = r->d()->version;
+    *w->d()->database = db;
+    *w->d()->version = *r->d()->version;
     w->d()->readonly = readOnly;
 
     db.transaction();
@@ -585,9 +596,9 @@ import QtQuick.LocalStorage 2.0 as Sql
 db = Sql.openDatabaseSync(identifier, version, description, estimated_size, callback(db))
 \endcode
 The above code returns the database identified by \e identifier. If the database does not already exist, it
-is created, and the function \e callback is called with the database as a parameter. \e description
-and \e estimated_size are written to the INI file (described below), but are otherwise currently
-unused.
+is created, and the function \e callback is called with the database as a parameter. \e identifier is the
+name of the physical file (with or without full path) containing the database.  \e description and
+\e estimated_size are written to the INI file (described below), but are currently unused.
 
 May throw exception with code property SQLException.DATABASE_ERR, or SQLException.VERSION_ERR.
 
@@ -595,7 +606,7 @@ When a database is first created, an INI file is also created specifying its cha
 
 \table
 \header \li \b {Key} \li \b {Value}
-\row \li Name \li The name of the database passed to \c openDatabase()
+\row \li Identifier \li The name of the database passed to \c openDatabase()
 \row \li Version \li The version of the database passed to \c openDatabase()
 \row \li Description \li The description of the database passed to \c openDatabase()
 \row \li EstimatedSize \li The estimated size (in bytes) of the database passed to \c openDatabase()
@@ -615,12 +626,19 @@ you can call \e executeSql on \e tx to upgrade the database.
 
 May throw exception with code property SQLException.DATABASE_ERR or SQLException.UNKNOWN_ERR.
 
+See example below.
+
+\snippet qml/localstorage/dbtransaction.js 2
+
 \section3 db.transaction(callback(tx))
 
 This method creates a read/write transaction and passed to \e callback. In this function,
 you can call \e executeSql on \e tx to read and modify the database.
 
 If the callback throws exceptions, the transaction is rolled back.
+Below you will find an example of a database transaction which catches exceptions.
+
+\snippet qml/localstorage/dbtransaction.js 0
 
 \section3 db.readTransaction(callback(tx))
 
@@ -643,6 +661,9 @@ It returns a results object, with the following properties:
 
 May throw exception with code property SQLException.DATABASE_ERR, SQLException.SYNTAX_ERR, or SQLException.UNKNOWN_ERR.
 
+See below for an example:
+
+\snippet qml/localstorage/dbtransaction.js 1
 
 \section1 Method Documentation
 
@@ -738,8 +759,8 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args)
     QV4::Scoped<QQmlSqlDatabaseWrapper> db(scope, QQmlSqlDatabaseWrapper::create(scope.engine));
     QV4::ScopedObject p(scope, databaseData(scope.engine)->databaseProto.value());
     db->setPrototype(p.getPointer());
-    db->d()->database = database;
-    db->d()->version = version;
+    *db->d()->database = database;
+    *db->d()->version = version;
 
     if (created && dbcreationCallback) {
         ScopedCallData callData(scope, 1);
diff --git a/src/imports/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes
index 7d81cdf6f4..dee81a78d0 100644
--- a/src/imports/localstorage/plugins.qmltypes
+++ b/src/imports/localstorage/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.LocalStorage 2.0'
+// 'qmlplugindump -nonrelocatable -noforceqtquick QtQuick.LocalStorage 2.0'
 
 Module {
     dependencies: []
diff --git a/src/imports/models/plugins.qmltypes b/src/imports/models/plugins.qmltypes
index 0bd52a13fd..aa06a2a709 100644
--- a/src/imports/models/plugins.qmltypes
+++ b/src/imports/models/plugins.qmltypes
@@ -7,272 +7,7 @@ import QtQuick.tooling 1.2
 // 'qmlplugindump -nonrelocatable QtQml.Models 2.3'
 
 Module {
-    dependencies: []
-    Component {
-        name: "QAbstractItemModel"
-        prototype: "QObject"
-        Enum {
-            name: "LayoutChangeHint"
-            values: {
-                "NoLayoutChangeHint": 0,
-                "VerticalSortHint": 1,
-                "HorizontalSortHint": 2
-            }
-        }
-        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" }
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "QItemSelectionModel"
         prototype: "QObject"
@@ -384,203 +119,4 @@ Module {
         }
         Method { name: "selectedColumns"; type: "QModelIndexList" }
     }
-    Component {
-        name: "QQmlDelegateModel"
-        defaultProperty: "delegate"
-        prototype: "QQmlInstanceModel"
-        exports: ["QtQml.Models/DelegateModel 2.1"]
-        exportMetaObjectRevisions: [0]
-        attachedType: "QQmlDelegateModelAttached"
-        Property { name: "model"; type: "QVariant" }
-        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "filterOnGroup"; type: "string" }
-        Property { name: "items"; type: "QQmlDelegateModelGroup"; isReadonly: true; isPointer: true }
-        Property {
-            name: "persistedItems"
-            type: "QQmlDelegateModelGroup"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "groups"; type: "QQmlDelegateModelGroup"; isList: true; isReadonly: true }
-        Property { name: "parts"; type: "QObject"; isReadonly: true; isPointer: true }
-        Property { name: "rootIndex"; type: "QVariant" }
-        Signal { name: "filterGroupChanged" }
-        Signal { name: "defaultGroupsChanged" }
-        Method {
-            name: "modelIndex"
-            type: "QVariant"
-            Parameter { name: "idx"; type: "int" }
-        }
-        Method { name: "parentModelIndex"; type: "QVariant" }
-    }
-    Component {
-        name: "QQmlDelegateModelAttached"
-        prototype: "QObject"
-        Property { name: "model"; type: "QQmlDelegateModel"; isReadonly: true; isPointer: true }
-        Property { name: "groups"; type: "QStringList" }
-        Property { name: "isUnresolved"; type: "bool"; isReadonly: true }
-        Signal { name: "unresolvedChanged" }
-    }
-    Component {
-        name: "QQmlDelegateModelGroup"
-        prototype: "QObject"
-        exports: ["QtQml.Models/DelegateModelGroup 2.1"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "name"; type: "string" }
-        Property { name: "includeByDefault"; type: "bool" }
-        Signal { name: "defaultIncludeChanged" }
-        Signal {
-            name: "changed"
-            Parameter { name: "removed"; type: "QQmlV4Handle" }
-            Parameter { name: "inserted"; type: "QQmlV4Handle" }
-        }
-        Method {
-            name: "insert"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "create"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "resolve"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "remove"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "addGroups"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "removeGroups"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "setGroups"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "move"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "get"
-            type: "QQmlV4Handle"
-            Parameter { name: "index"; type: "int" }
-        }
-    }
-    Component { name: "QQmlDelegateModelParts"; prototype: "QObject" }
-    Component {
-        name: "QQmlListElement"
-        prototype: "QObject"
-        exports: ["QtQml.Models/ListElement 2.1"]
-        exportMetaObjectRevisions: [0]
-    }
-    Component {
-        name: "QQmlListModel"
-        prototype: "QAbstractListModel"
-        exports: ["QtQml.Models/ListModel 2.1"]
-        exportMetaObjectRevisions: [0]
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "dynamicRoles"; type: "bool" }
-        Method { name: "clear" }
-        Method {
-            name: "remove"
-            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "append"
-            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "insert"
-            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "get"
-            type: "QQmlV4Handle"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method {
-            name: "set"
-            Parameter { name: "index"; type: "int" }
-            Parameter { type: "QQmlV4Handle" }
-        }
-        Method {
-            name: "setProperty"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "property"; type: "string" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Method {
-            name: "move"
-            Parameter { name: "from"; type: "int" }
-            Parameter { name: "to"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Method { name: "sync" }
-    }
-    Component {
-        name: "QQmlObjectModel"
-        defaultProperty: "children"
-        prototype: "QQmlInstanceModel"
-        exports: [
-            "QtQml.Models/ObjectModel 2.1",
-            "QtQml.Models/ObjectModel 2.3"
-        ]
-        exportMetaObjectRevisions: [0, 3]
-        attachedType: "QQmlObjectModelAttached"
-        Property { name: "children"; type: "QObject"; isList: true; isReadonly: true }
-        Method { name: "clear"; revision: 3 }
-        Method {
-            name: "get"
-            revision: 3
-            type: "QObject*"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method {
-            name: "append"
-            revision: 3
-            Parameter { name: "object"; type: "QObject"; isPointer: true }
-        }
-        Method {
-            name: "insert"
-            revision: 3
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "object"; type: "QObject"; isPointer: true }
-        }
-        Method {
-            name: "move"
-            revision: 3
-            Parameter { name: "from"; type: "int" }
-            Parameter { name: "to"; type: "int" }
-            Parameter { name: "n"; type: "int" }
-        }
-        Method {
-            name: "move"
-            revision: 3
-            Parameter { name: "from"; type: "int" }
-            Parameter { name: "to"; type: "int" }
-        }
-        Method {
-            name: "remove"
-            revision: 3
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "n"; type: "int" }
-        }
-        Method {
-            name: "remove"
-            revision: 3
-            Parameter { name: "index"; type: "int" }
-        }
-    }
-    Component {
-        name: "QQmlObjectModelAttached"
-        prototype: "QObject"
-        Property { name: "index"; type: "int"; isReadonly: true }
-    }
 }
diff --git a/src/imports/particles/plugins.qmltypes b/src/imports/particles/plugins.qmltypes
index ce78392610..5c4bd01980 100644
--- a/src/imports/particles/plugins.qmltypes
+++ b/src/imports/particles/plugins.qmltypes
@@ -7,7 +7,7 @@ import QtQuick.tooling 1.2
 // 'qmlplugindump -nonrelocatable QtQuick.Particles 2.0'
 
 Module {
-    dependencies: []
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "QQuickAgeAffector"
         defaultProperty: "data"
@@ -492,160 +492,6 @@ Module {
         }
     }
     Component {
-        name: "QQuickItem"
-        defaultProperty: "data"
-        prototype: "QObject"
-        Enum {
-            name: "TransformOrigin"
-            values: {
-                "TopLeft": 0,
-                "Top": 1,
-                "TopRight": 2,
-                "Left": 3,
-                "Center": 4,
-                "Right": 5,
-                "BottomLeft": 6,
-                "Bottom": 7,
-                "BottomRight": 8
-            }
-        }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "x"; type: "double" }
-        Property { name: "y"; type: "double" }
-        Property { name: "z"; type: "double" }
-        Property { name: "width"; type: "double" }
-        Property { name: "height"; type: "double" }
-        Property { name: "opacity"; type: "double" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "double" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
-        Property { name: "rotation"; type: "double" }
-        Property { name: "scale"; type: "double" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "antialiasing"; type: "bool" }
-        Property { name: "implicitWidth"; type: "double" }
-        Property { name: "implicitHeight"; type: "double" }
-        Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "double" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnTabChanged"
-            revision: 1
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "antialiasingChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "windowChanged"
-            revision: 1
-            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
-        }
-        Method { name: "update" }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-            Parameter { name: "targetSize"; type: "QSize" }
-        }
-        Method {
-            name: "grabToImage"
-            revision: 2
-            type: "bool"
-            Parameter { name: "callback"; type: "QJSValue" }
-        }
-        Method {
-            name: "contains"
-            type: "bool"
-            Parameter { name: "point"; type: "QPointF" }
-        }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QQmlV4Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "forceActiveFocus"
-            Parameter { name: "reason"; type: "Qt::FocusReason" }
-        }
-        Method {
-            name: "nextItemInFocusChain"
-            revision: 1
-            type: "QQuickItem*"
-            Parameter { name: "forward"; type: "bool" }
-        }
-        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "double" }
-            Parameter { name: "y"; type: "double" }
-        }
-    }
-    Component {
         name: "QQuickItemParticle"
         defaultProperty: "data"
         prototype: "QQuickParticlePainter"
@@ -1151,56 +997,6 @@ 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 864aca1f32..82333627a0 100644
--- a/src/imports/qtqml/plugins.qmltypes
+++ b/src/imports/qtqml/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQml 2.2'
+// 'qmlplugindump -nonrelocatable -noforceqtquick QtQml 2.3'
 
 Module {
     dependencies: []
@@ -27,12 +27,13 @@ Module {
     Component {
         name: "QQmlBind"
         prototype: "QObject"
-        exports: ["QtQml/Binding 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtQml/Binding 2.0", "QtQml/Binding 2.8"]
+        exportMetaObjectRevisions: [0, 8]
         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" }
     }
     Component {
         name: "QQmlComponent"
@@ -92,10 +93,12 @@ Module {
     Component {
         name: "QQmlConnections"
         prototype: "QObject"
-        exports: ["QtQml/Connections 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtQml/Connections 2.0", "QtQml/Connections 2.3"]
+        exportMetaObjectRevisions: [0, 1]
         Property { name: "target"; type: "QObject"; isPointer: true }
+        Property { name: "enabled"; type: "bool" }
         Property { name: "ignoreUnknownSignals"; type: "bool" }
+        Signal { name: "enabledChanged"; revision: 1 }
     }
     Component {
         name: "QQmlInstanceModel"
@@ -193,6 +196,13 @@ Module {
         }
     }
     Component {
+        name: "QQmlLoggingCategory"
+        prototype: "QObject"
+        exports: ["QtQml/LoggingCategory 2.8"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "name"; type: "string" }
+    }
+    Component {
         name: "QQmlTimer"
         prototype: "QObject"
         exports: ["QtQml/Timer 2.0"]
@@ -215,6 +225,7 @@ Module {
         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" }
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index c3a14254f3..441cd743aa 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick 2.6'
+// 'qmlplugindump -nonrelocatable -noforceqtquick QtQuick 2.8'
 
 Module {
     dependencies: []
@@ -318,7 +318,9 @@ Module {
             }
         }
         Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
+        Property { name: "anchorRectangle"; type: "QRectF"; isReadonly: true }
         Property { name: "keyboardRectangle"; type: "QRectF"; isReadonly: true }
+        Property { name: "inputItemClipRectangle"; type: "QRectF"; isReadonly: true }
         Property { name: "visible"; type: "bool"; isReadonly: true }
         Property { name: "animating"; type: "bool"; isReadonly: true }
         Property { name: "locale"; type: "QLocale"; isReadonly: true }
@@ -1156,6 +1158,7 @@ Module {
         Property { name: "layoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
         Property { name: "supportsMultipleWindows"; type: "bool"; isReadonly: true }
         Property { name: "state"; type: "Qt::ApplicationState"; isReadonly: true }
+        Property { name: "font"; type: "QFont"; isReadonly: true }
         Signal {
             name: "stateChanged"
             Parameter { name: "state"; type: "Qt::ApplicationState" }
@@ -1213,6 +1216,24 @@ Module {
         Property { name: "sourceSize"; type: "QSize"; isReadonly: true }
     }
     Component {
+        name: "QQuickBorderImageMesh"
+        prototype: "QQuickShaderEffectMesh"
+        exports: ["QtQuick/BorderImageMesh 2.8"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "TileMode"
+            values: {
+                "Stretch": 0,
+                "Repeat": 1,
+                "Round": 2
+            }
+        }
+        Property { name: "border"; type: "QQuickScaleGrid"; isReadonly: true; isPointer: true }
+        Property { name: "size"; type: "QSize" }
+        Property { name: "horizontalTileMode"; type: "TileMode" }
+        Property { name: "verticalTileMode"; type: "TileMode" }
+    }
+    Component {
         name: "QQuickCanvasItem"
         defaultProperty: "data"
         prototype: "QQuickItem"
@@ -1378,6 +1399,7 @@ Module {
         Property { name: "source"; type: "QObject"; isPointer: true }
         Property { name: "target"; type: "QObject"; isReadonly: true; isPointer: true }
         Property { name: "hotSpot"; type: "QPointF" }
+        Property { name: "imageSource"; revision: 8; type: "QUrl" }
         Property { name: "keys"; type: "QStringList" }
         Property { name: "mimeData"; type: "QVariantMap" }
         Property { name: "supportedActions"; type: "Qt::DropActions" }
@@ -1497,7 +1519,8 @@ Module {
                 "AutoFlickDirection": 0,
                 "HorizontalFlick": 1,
                 "VerticalFlick": 2,
-                "HorizontalAndVerticalFlick": 3
+                "HorizontalAndVerticalFlick": 3,
+                "AutoFlickIfNeeded": 12
             }
         }
         Property { name: "contentWidth"; type: "double" }
@@ -1780,6 +1803,69 @@ Module {
         Property { name: "color"; type: "QColor" }
     }
     Component {
+        name: "QQuickGraphicsInfo"
+        prototype: "QObject"
+        exports: ["QtQuick/GraphicsInfo 2.8"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "GraphicsApi"
+            values: {
+                "Unknown": 0,
+                "Software": 1,
+                "OpenGL": 2,
+                "Direct3D12": 3
+            }
+        }
+        Enum {
+            name: "ShaderType"
+            values: {
+                "UnknownShadingLanguage": 0,
+                "GLSL": 1,
+                "HLSL": 2
+            }
+        }
+        Enum {
+            name: "ShaderCompilationType"
+            values: {
+                "RuntimeCompilation": 1,
+                "OfflineCompilation": 2
+            }
+        }
+        Enum {
+            name: "ShaderSourceType"
+            values: {
+                "ShaderSourceString": 1,
+                "ShaderSourceFile": 2,
+                "ShaderByteCode": 4
+            }
+        }
+        Enum {
+            name: "OpenGLContextProfile"
+            values: {
+                "OpenGLNoProfile": 0,
+                "OpenGLCoreProfile": 1,
+                "OpenGLCompatibilityProfile": 2
+            }
+        }
+        Enum {
+            name: "RenderableType"
+            values: {
+                "SurfaceFormatUnspecified": 0,
+                "SurfaceFormatOpenGL": 1,
+                "SurfaceFormatOpenGLES": 2
+            }
+        }
+        Property { name: "api"; type: "GraphicsApi"; isReadonly: true }
+        Property { name: "shaderType"; type: "ShaderType"; isReadonly: true }
+        Property { name: "shaderCompilationType"; type: "ShaderCompilationType"; isReadonly: true }
+        Property { name: "shaderSourceType"; type: "ShaderSourceType"; isReadonly: true }
+        Property { name: "majorVersion"; type: "int"; isReadonly: true }
+        Property { name: "minorVersion"; type: "int"; isReadonly: true }
+        Property { name: "profile"; type: "OpenGLContextProfile"; isReadonly: true }
+        Property { name: "renderableType"; type: "RenderableType"; isReadonly: true }
+    }
+    Component {
         name: "QQuickGrid"
         defaultProperty: "data"
         prototype: "QQuickBasePositioner"
@@ -1850,8 +1936,12 @@ Module {
         name: "QQuickGridView"
         defaultProperty: "data"
         prototype: "QQuickItemView"
-        exports: ["QtQuick/GridView 2.0", "QtQuick/GridView 2.1"]
-        exportMetaObjectRevisions: [0, 1]
+        exports: [
+            "QtQuick/GridView 2.0",
+            "QtQuick/GridView 2.1",
+            "QtQuick/GridView 2.7"
+        ]
+        exportMetaObjectRevisions: [0, 1, 7]
         attachedType: "QQuickGridViewAttached"
         Enum {
             name: "Flow"
@@ -2120,6 +2210,18 @@ Module {
             Parameter { name: "point"; type: "QPointF" }
         }
         Method {
+            name: "mapToGlobal"
+            revision: 7
+            type: "QPointF"
+            Parameter { name: "point"; type: "QPointF" }
+        }
+        Method {
+            name: "mapFromGlobal"
+            revision: 7
+            type: "QPointF"
+            Parameter { name: "point"; type: "QPointF" }
+        }
+        Method {
             name: "mapFromItem"
             Parameter { type: "QQmlV4Function"; isPointer: true }
         }
@@ -2260,6 +2362,7 @@ Module {
         Property { name: "currentIndex"; type: "int" }
         Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "keyNavigationWraps"; type: "bool" }
+        Property { name: "keyNavigationEnabled"; revision: 7; type: "bool" }
         Property { name: "cacheBuffer"; type: "int" }
         Property { name: "displayMarginBeginning"; revision: 2; type: "int" }
         Property { name: "displayMarginEnd"; revision: 2; type: "int" }
@@ -2285,6 +2388,7 @@ Module {
         Property { name: "preferredHighlightBegin"; type: "double" }
         Property { name: "preferredHighlightEnd"; type: "double" }
         Property { name: "highlightMoveDuration"; type: "int" }
+        Signal { name: "keyNavigationEnabledChanged"; revision: 7 }
         Signal { name: "populateTransitionChanged" }
         Signal { name: "addTransitionChanged" }
         Signal { name: "addDisplacedTransitionChanged" }
@@ -2559,9 +2663,10 @@ Module {
         exports: [
             "QtQuick/ListView 2.0",
             "QtQuick/ListView 2.1",
-            "QtQuick/ListView 2.4"
+            "QtQuick/ListView 2.4",
+            "QtQuick/ListView 2.7"
         ]
-        exportMetaObjectRevisions: [0, 1, 2]
+        exportMetaObjectRevisions: [0, 1, 2, 7]
         attachedType: "QQuickListViewAttached"
         Enum {
             name: "Orientation"
@@ -3014,8 +3119,8 @@ Module {
         name: "QQuickPathView"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["QtQuick/PathView 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtQuick/PathView 2.0", "QtQuick/PathView 2.7"]
+        exportMetaObjectRevisions: [0, 7]
         attachedType: "QQuickPathViewAttached"
         Enum {
             name: "HighlightRangeMode"
@@ -3034,6 +3139,14 @@ Module {
             }
         }
         Enum {
+            name: "MovementDirection"
+            values: {
+                "Shortest": 0,
+                "Negative": 1,
+                "Positive": 2
+            }
+        }
+        Enum {
             name: "PositionMode"
             values: {
                 "Beginning": 0,
@@ -3065,10 +3178,12 @@ Module {
         Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
         Property { name: "pathItemCount"; type: "int" }
         Property { name: "snapMode"; type: "SnapMode" }
+        Property { name: "movementDirection"; revision: 7; type: "MovementDirection" }
         Property { name: "cacheItemCount"; type: "int" }
         Signal { name: "snapPositionChanged" }
         Signal { name: "movementStarted" }
         Signal { name: "movementEnded" }
+        Signal { name: "movementDirectionChanged"; revision: 7 }
         Signal { name: "flickStarted" }
         Signal { name: "flickEnded" }
         Signal { name: "dragStarted" }
@@ -3942,23 +4057,23 @@ Module {
         }
         Signal {
             name: "styleChanged"
-            Parameter { name: "style"; type: "TextStyle" }
+            Parameter { name: "style"; type: "QQuickText::TextStyle" }
         }
         Signal {
             name: "horizontalAlignmentChanged"
-            Parameter { name: "alignment"; type: "HAlignment" }
+            Parameter { name: "alignment"; type: "QQuickText::HAlignment" }
         }
         Signal {
             name: "verticalAlignmentChanged"
-            Parameter { name: "alignment"; type: "VAlignment" }
+            Parameter { name: "alignment"; type: "QQuickText::VAlignment" }
         }
         Signal {
             name: "textFormatChanged"
-            Parameter { name: "textFormat"; type: "TextFormat" }
+            Parameter { name: "textFormat"; type: "QQuickText::TextFormat" }
         }
         Signal {
             name: "elideModeChanged"
-            Parameter { name: "mode"; type: "TextElideMode" }
+            Parameter { name: "mode"; type: "QQuickText::TextElideMode" }
         }
         Signal { name: "contentSizeChanged" }
         Signal {
@@ -3997,9 +4112,10 @@ Module {
             "QtQuick/TextEdit 2.1",
             "QtQuick/TextEdit 2.2",
             "QtQuick/TextEdit 2.3",
-            "QtQuick/TextEdit 2.6"
+            "QtQuick/TextEdit 2.6",
+            "QtQuick/TextEdit 2.7"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 3, 6]
+        exportMetaObjectRevisions: [0, 1, 2, 3, 6, 7]
         Enum {
             name: "HAlignment"
             values: {
@@ -4070,6 +4186,7 @@ Module {
         Property { name: "cursorPosition"; type: "int" }
         Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
         Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "overwriteMode"; type: "bool" }
         Property { name: "selectionStart"; type: "int"; isReadonly: true }
         Property { name: "selectionEnd"; type: "int"; isReadonly: true }
         Property { name: "selectedText"; type: "string"; isReadonly: true }
@@ -4099,6 +4216,8 @@ Module {
         Property { name: "leftPadding"; revision: 6; type: "double" }
         Property { name: "rightPadding"; revision: 6; type: "double" }
         Property { name: "bottomPadding"; revision: 6; type: "double" }
+        Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true }
+        Signal { name: "preeditTextChanged"; revision: 7 }
         Signal { name: "contentSizeChanged" }
         Signal {
             name: "colorChanged"
@@ -4118,15 +4237,15 @@ Module {
         }
         Signal {
             name: "horizontalAlignmentChanged"
-            Parameter { name: "alignment"; type: "HAlignment" }
+            Parameter { name: "alignment"; type: "QQuickTextEdit::HAlignment" }
         }
         Signal {
             name: "verticalAlignmentChanged"
-            Parameter { name: "alignment"; type: "VAlignment" }
+            Parameter { name: "alignment"; type: "QQuickTextEdit::VAlignment" }
         }
         Signal {
             name: "textFormatChanged"
-            Parameter { name: "textFormat"; type: "TextFormat" }
+            Parameter { name: "textFormat"; type: "QQuickTextEdit::TextFormat" }
         }
         Signal {
             name: "readOnlyChanged"
@@ -4137,6 +4256,10 @@ Module {
             Parameter { name: "isCursorVisible"; type: "bool" }
         }
         Signal {
+            name: "overwriteModeChanged"
+            Parameter { name: "overwriteMode"; type: "bool" }
+        }
+        Signal {
             name: "activeFocusOnPressChanged"
             Parameter { name: "activeFocusOnPressed"; type: "bool" }
         }
@@ -4159,7 +4282,7 @@ Module {
         }
         Signal {
             name: "mouseSelectionModeChanged"
-            Parameter { name: "mode"; type: "SelectionMode" }
+            Parameter { name: "mode"; type: "QQuickTextEdit::SelectionMode" }
         }
         Signal {
             name: "linkActivated"
@@ -4210,6 +4333,7 @@ Module {
             revision: 2
             Parameter { name: "text"; type: "string" }
         }
+        Method { name: "clear"; revision: 7 }
         Method {
             name: "inputMethodQuery"
             revision: 4
@@ -4265,9 +4389,10 @@ Module {
             "QtQuick/TextInput 2.0",
             "QtQuick/TextInput 2.2",
             "QtQuick/TextInput 2.4",
-            "QtQuick/TextInput 2.6"
+            "QtQuick/TextInput 2.6",
+            "QtQuick/TextInput 2.7"
         ]
-        exportMetaObjectRevisions: [0, 2, 3, 6]
+        exportMetaObjectRevisions: [0, 2, 3, 6, 7]
         Enum {
             name: "EchoMode"
             values: {
@@ -4339,6 +4464,7 @@ Module {
         Property { name: "cursorPosition"; type: "int" }
         Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
         Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true }
+        Property { name: "overwriteMode"; type: "bool" }
         Property { name: "selectionStart"; type: "int"; isReadonly: true }
         Property { name: "selectionEnd"; type: "int"; isReadonly: true }
         Property { name: "selectedText"; type: "string"; isReadonly: true }
@@ -4352,6 +4478,7 @@ Module {
         Property { name: "passwordCharacter"; type: "string" }
         Property { name: "passwordMaskDelay"; revision: 3; type: "int" }
         Property { name: "displayText"; type: "string"; isReadonly: true }
+        Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true }
         Property { name: "autoScroll"; type: "bool" }
         Property { name: "selectByMouse"; type: "bool" }
         Property { name: "mouseSelectionMode"; type: "SelectionMode" }
@@ -4376,11 +4503,11 @@ Module {
         }
         Signal {
             name: "horizontalAlignmentChanged"
-            Parameter { name: "alignment"; type: "HAlignment" }
+            Parameter { name: "alignment"; type: "QQuickTextInput::HAlignment" }
         }
         Signal {
             name: "verticalAlignmentChanged"
-            Parameter { name: "alignment"; type: "VAlignment" }
+            Parameter { name: "alignment"; type: "QQuickTextInput::VAlignment" }
         }
         Signal {
             name: "readOnlyChanged"
@@ -4391,6 +4518,10 @@ Module {
             Parameter { name: "isCursorVisible"; type: "bool" }
         }
         Signal {
+            name: "overwriteModeChanged"
+            Parameter { name: "overwriteMode"; type: "bool" }
+        }
+        Signal {
             name: "maximumLengthChanged"
             Parameter { name: "maximumLength"; type: "int" }
         }
@@ -4400,13 +4531,14 @@ Module {
         }
         Signal {
             name: "echoModeChanged"
-            Parameter { name: "echoMode"; type: "EchoMode" }
+            Parameter { name: "echoMode"; type: "QQuickTextInput::EchoMode" }
         }
         Signal {
             name: "passwordMaskDelayChanged"
             revision: 3
             Parameter { name: "delay"; type: "int" }
         }
+        Signal { name: "preeditTextChanged"; revision: 7 }
         Signal {
             name: "activeFocusOnPressChanged"
             Parameter { name: "activeFocusOnPress"; type: "bool" }
@@ -4421,7 +4553,7 @@ Module {
         }
         Signal {
             name: "mouseSelectionModeChanged"
-            Parameter { name: "mode"; type: "SelectionMode" }
+            Parameter { name: "mode"; type: "QQuickTextInput::SelectionMode" }
         }
         Signal { name: "contentSizeChanged" }
         Signal { name: "paddingChanged"; revision: 6 }
@@ -4463,6 +4595,7 @@ Module {
             revision: 3
             Parameter { name: "position"; type: "int" }
         }
+        Method { name: "clear"; revision: 7 }
         Method {
             name: "positionAt"
             Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
@@ -4628,7 +4761,7 @@ Module {
         Property { name: "pixelDelta"; type: "QPoint"; isReadonly: true }
         Property { name: "buttons"; type: "int"; isReadonly: true }
         Property { name: "modifiers"; type: "int"; isReadonly: true }
-        Property { name: "inverted"; type: "bool" }
+        Property { name: "inverted"; type: "bool"; isReadonly: true }
         Property { name: "accepted"; type: "bool" }
     }
     Component {
diff --git a/src/imports/settings/plugins.qmltypes b/src/imports/settings/plugins.qmltypes
index eaa310edc9..40d8746525 100644
--- a/src/imports/settings/plugins.qmltypes
+++ b/src/imports/settings/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable Qt.labs.settings 1.0'
+// 'qmlplugindump -nonrelocatable -noforceqtquick Qt.labs.settings 1.0'
 
 Module {
     dependencies: []
diff --git a/src/imports/statemachine/plugins.qmltypes b/src/imports/statemachine/plugins.qmltypes
index c4b453b9e4..0fe9b63e03 100644
--- a/src/imports/statemachine/plugins.qmltypes
+++ b/src/imports/statemachine/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQml.StateMachine 1.0'
+// 'qmlplugindump -nonrelocatable -noforceqtquick QtQml.StateMachine 1.0'
 
 Module {
     dependencies: []
diff --git a/src/imports/testlib/plugins.qmltypes b/src/imports/testlib/plugins.qmltypes
index 2beb38a940..563778e55e 100644
--- a/src/imports/testlib/plugins.qmltypes
+++ b/src/imports/testlib/plugins.qmltypes
@@ -4,15 +4,16 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtTest 1.0'
+// 'qmlplugindump -nonrelocatable -noforceqtquick QtTest 1.1'
 
 Module {
-    dependencies: []
+    dependencies: ["QtQuick 2.0"]
     Component {
         name: "QuickTestEvent"
         prototype: "QObject"
         exports: ["QtTest/TestEvent 1.0"]
         exportMetaObjectRevisions: [0]
+        Property { name: "defaultMouseDelay"; type: "int"; isReadonly: true }
         Method {
             name: "keyPress"
             type: "bool"
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes
index 8c21271614..6a8dbfa024 100644
--- a/src/imports/window/plugins.qmltypes
+++ b/src/imports/window/plugins.qmltypes
@@ -7,7 +7,20 @@ import QtQuick.tooling 1.2
 // 'qmlplugindump -nonrelocatable QtQuick.Window 2.2'
 
 Module {
-    dependencies: []
+    dependencies: ["QtQuick 2.8"]
+    Component {
+        name: "QQuickRootItem"
+        defaultProperty: "data"
+        prototype: "QQuickItem"
+        Method {
+            name: "setWidth"
+            Parameter { name: "w"; type: "int" }
+        }
+        Method {
+            name: "setHeight"
+            Parameter { name: "h"; type: "int" }
+        }
+    }
     Component {
         name: "QQuickScreen"
         prototype: "QObject"
@@ -102,6 +115,7 @@ Module {
         Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "width"; type: "int"; isReadonly: true }
         Property { name: "height"; type: "int"; isReadonly: true }
+        Property { name: "window"; type: "QQuickWindow"; isReadonly: true; isPointer: true }
     }
     Component {
         name: "QQuickWindowQmlImpl"
diff --git a/src/imports/xmllistmodel/plugins.qmltypes b/src/imports/xmllistmodel/plugins.qmltypes
index d098d11409..cc675d5f83 100644
--- a/src/imports/xmllistmodel/plugins.qmltypes
+++ b/src/imports/xmllistmodel/plugins.qmltypes
@@ -7,272 +7,7 @@ import QtQuick.tooling 1.2
 // 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.0'
 
 Module {
-    dependencies: []
-    Component {
-        name: "QAbstractItemModel"
-        prototype: "QObject"
-        Enum {
-            name: "LayoutChangeHint"
-            values: {
-                "NoLayoutChangeHint": 0,
-                "VerticalSortHint": 1,
-                "HorizontalSortHint": 2
-            }
-        }
-        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" }
+    dependencies: ["QtQuick 2.8"]
     Component {
         name: "QQuickXmlListModel"
         defaultProperty: "roles"