Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into wip/v4

Conflicts: src/imports/qtquick2/plugins.qmltypes src/qml/debugger/qv8debugservice.cpp src/qml/qml/qml.pri src/qml/qml/qqmlcompiler.cpp src/qml/qml/qqmlcomponent.cpp src/qml/qml/qqmlcontext.cpp src/qml/qml/qqmldata_p.h src/qml/qml/qqmlengine_p.h src/qml/qml/qqmljavascriptexpression.cpp src/qml/qml/qqmlxmlhttprequest.cpp src/qml/qml/v4/qv4bindings.cpp src/qml/qml/v4/qv4irbuilder.cpp src/qml/qml/v4/qv4jsonobject_p.h src/qml/qml/v8/qqmlbuiltinfunctions.cpp src/qml/qml/v8/qv8bindings.cpp src/qml/qml/v8/qv8contextwrapper.cpp src/qml/qml/v8/qv8listwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper.cpp src/qml/qml/v8/qv8qobjectwrapper_p.h src/qml/qml/v8/qv8sequencewrapper_p_p.h src/qml/qml/v8/qv8typewrapper.cpp src/qml/qml/v8/qv8valuetypewrapper.cpp src/qml/types/qqmldelegatemodel.cpp src/quick/items/context2d/qquickcanvasitem.cpp src/quick/items/context2d/qquickcontext2d.cpp sync.profile tests/auto/qml/qjsengine/tst_qjsengine.cpp tests/benchmarks/qml/animation/animation.pro tools/qmlprofiler/qmlprofiler.pro Change-Id: I18a76b8a81d87523247fa03a44ca334b1a2360c9
author: Simon Hausmann <simon.hausmann@digia.com> 2013-06-24 11:26:22 +0200
committer: Simon Hausmann <simon.hausmann@digia.com> 2013-06-24 11:48:46 +0200
commit: 1a9759855639b9e2b3cdc0687d3381dcbf6c9815 (patch)
tree: b2da51f6eddddb83c2d97cdcfac24d38d2e67a4e /src/imports
parent: 8217ec1b888f3ff93f004801b018c5f85362c484 (diff)
parent: e1fc2793aef53b84a3f1e19b6d6bdf1141340074 (diff)
26 files changed, 916 insertions, 293 deletions
diff --git a/src/imports/dialogs/dialogs.pro b/src/imports/dialogs/dialogs.pro
index b7704dadda..53cad30cee 100644
--- a/src/imports/dialogs/dialogs.pro
+++ b/src/imports/dialogs/dialogs.pro
@@ -3,6 +3,8 @@ TARGET  = dialogplugin
 TARGETPATH = QtQuick/Dialogs
 IMPORT_VERSION = 1.0
 
+QMAKE_DOCS = $$PWD/doc/qtquickdialogs.qdocconf
+
 SOURCES += \
     qquickabstractfiledialog.cpp \
     qquickplatformfiledialog.cpp \
diff --git a/src/imports/dialogs/doc/qtquickdialogs.qdocconf b/src/imports/dialogs/doc/qtquickdialogs.qdocconf
new file mode 100644
index 0000000000..34f19b5ff3
--- /dev/null
+++ b/src/imports/dialogs/doc/qtquickdialogs.qdocconf
@@ -0,0 +1,36 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+project                 = QtQuickDialogs
+description             = Qt Quick Dialogs Reference Documentation
+url                     = http://qt-project.org/doc/qt-$QT_VER/qtquickdialogs/
+version                 = $QT_VERSION
+
+qhp.projects            = QtQuickDialogs
+
+qhp.QtQuickDialogs.file           = qtquickdialogs.qhp
+qhp.QtQuickDialogs.namespace      = org.qt-project.qtquickdialogs.$QT_VERSION_TAG
+qhp.QtQuickDialogs.virtualFolder  = qtquickdialogs
+qhp.QtQuickDialogs.indexTitle     = Qt Quick Dialogs
+qhp.QtQuickDialogs.indexRoot      =
+
+qhp.QtQuickDialogs.filterAttributes    = qtquickdialogs $QT_VERSION qtrefdoc
+qhp.QtQuickDialogs.customFilters.Qt.name = QtQuickDialogs $QT_VERSION
+qhp.QtQuickDialogs.customFilters.Qt.filterAttributes = qtquickdialogs $QT_VERSION
+
+qhp.QtQuickDialogs.subprojects = qtquickdialogsqmltypes
+qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.title = QML Types
+qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.indexTitle = Qt Quick Dialogs QML Types
+qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.selectors = fake:qmlclass
+qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.sortPages = true
+
+depends = qtqml qtquick qtgui qtwidgets qtdoc
+
+exampledirs += ../../../../examples/quick/dialogs
+
+examplesinstallpath = quick/dialogs
+
+headerdirs += ..
+
+sourcedirs += ..
+
+imagedirs += images
diff --git a/src/imports/dialogs/doc/src/qtquickdialogs-examples.qdoc b/src/imports/dialogs/doc/src/qtquickdialogs-examples.qdoc
new file mode 100644
index 0000000000..ee277f48dc
--- /dev/null
+++ b/src/imports/dialogs/doc/src/qtquickdialogs-examples.qdoc
@@ -0,0 +1,36 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group qtquickdialog_examples
+    \ingroup qtquickexamples
+    \title Qt Quick Examples - Dialogs
+    \brief A Collection of examples for \l{Qt Quick Dialogs}, written in QML.
+
+    These examples show how to use the \l{Qt Quick Dialogs}.
+*/
+
diff --git a/src/imports/dialogs/doc/src/qtquickdialogs-index.qdoc b/src/imports/dialogs/doc/src/qtquickdialogs-index.qdoc
new file mode 100644
index 0000000000..5a1223b04d
--- /dev/null
+++ b/src/imports/dialogs/doc/src/qtquickdialogs-index.qdoc
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group dialogs
+    \title Dialogs
+*/
+
+/*!
+    \page qtquickdialogs-index.html
+    \title Qt Quick Dialogs
+
+    \brief Qt Quick Dialogs submodule
+
+    The module is new in Qt 5.1.
+
+    \section1 Dialogs
+
+    \annotatedlist dialogs
+
+    \section1 Related information
+
+    \section2 Examples
+     \list
+      \li \l{Qt Quick Examples - Dialogs}{Dialogs Examples}
+     \endlist
+
+    \section2 Reference
+     \list
+      \li \l{Qt Quick Dialogs QML Types}{QML Types}
+     \endlist
+
+*/
+
diff --git a/src/imports/dialogs/plugin.cpp b/src/imports/dialogs/plugin.cpp
index 67653e5965..5502a65310 100644
--- a/src/imports/dialogs/plugin.cpp
+++ b/src/imports/dialogs/plugin.cpp
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlmodule QtQuick.Dialogs 1
-    \title Qt Quick Dialog QML Types
+    \title Qt Quick Dialogs QML Types
     \ingroup qmlmodules
     \brief Provides QML types for standard file, color picker and message dialogs
 
diff --git a/src/imports/dialogs/plugins.qmltypes b/src/imports/dialogs/plugins.qmltypes
index faf68de909..80eb8bd291 100644
--- a/src/imports/dialogs/plugins.qmltypes
+++ b/src/imports/dialogs/plugins.qmltypes
@@ -3,39 +3,72 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command 'qmlplugindump QtQuick.Dialogs 1.0'.
+// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtQuick.Dialogs 1.0'.
 
 Module {
     Component {
-        name: "QQuickAbstractFileDialog"
+        name: "QQuickAbstractColorDialog"
+        prototype: "QQuickAbstractDialog"
+        Property { name: "showAlphaChannel"; type: "bool" }
+        Property { name: "color"; type: "QColor" }
+        Signal { name: "selectionAccepted" }
+        Method {
+            name: "setVisible"
+            Parameter { name: "v"; type: "bool" }
+        }
+        Method {
+            name: "setModality"
+            Parameter { name: "m"; type: "Qt::WindowModality" }
+        }
+        Method {
+            name: "setTitle"
+            Parameter { name: "t"; type: "string" }
+        }
+        Method {
+            name: "setColor"
+            Parameter { name: "arg"; type: "QColor" }
+        }
+        Method {
+            name: "setShowAlphaChannel"
+            Parameter { name: "arg"; type: "bool" }
+        }
+    }
+    Component {
+        name: "QQuickAbstractDialog"
         prototype: "QObject"
         Property { name: "visible"; type: "bool" }
         Property { name: "modality"; type: "Qt::WindowModality" }
         Property { name: "title"; type: "string" }
+        Property { name: "x"; type: "int" }
+        Property { name: "y"; type: "int" }
+        Property { name: "width"; type: "int" }
+        Property { name: "height"; type: "int" }
+        Signal { name: "visibilityChanged" }
+        Signal { name: "geometryChanged" }
+        Signal { name: "accepted" }
+        Signal { name: "rejected" }
+        Method { name: "open" }
+        Method { name: "close" }
+    }
+    Component {
+        name: "QQuickAbstractFileDialog"
+        prototype: "QQuickAbstractDialog"
         Property { name: "selectExisting"; type: "bool" }
         Property { name: "selectMultiple"; type: "bool" }
         Property { name: "selectFolder"; type: "bool" }
         Property { name: "folder"; type: "string" }
         Property { name: "nameFilters"; type: "QStringList" }
         Property { name: "selectedNameFilter"; type: "string" }
-        Property { name: "filePath"; type: "string"; isReadonly: true }
-        Property { name: "filePaths"; type: "QStringList"; isReadonly: true }
-        Signal { name: "visibilityChanged" }
+        Property { name: "fileUrl"; type: "QUrl"; isReadonly: true }
+        Property { name: "fileUrls"; type: "QList<QUrl>"; isReadonly: true }
         Signal { name: "filterSelected" }
         Signal { name: "fileModeChanged" }
-        Signal { name: "accepted" }
-        Signal { name: "rejected" }
-        Method { name: "open" }
-        Method { name: "close" }
+        Signal { name: "selectionAccepted" }
         Method {
             name: "setVisible"
             Parameter { name: "v"; type: "bool" }
         }
         Method {
-            name: "setModality"
-            Parameter { name: "m"; type: "Qt::WindowModality" }
-        }
-        Method {
             name: "setTitle"
             Parameter { name: "t"; type: "string" }
         }
@@ -65,8 +98,25 @@ Module {
         }
     }
     Component {
-        name: "QQuickQFileDialog"
+        name: "QQuickColorDialog"
+        defaultProperty: "implementation"
+        prototype: "QQuickAbstractColorDialog"
+        exports: ["QtQuick.Dialogs/AbstractColorDialog 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "implementation"; type: "QObject"; isPointer: true }
+    }
+    Component {
+        name: "QQuickFileDialog"
+        defaultProperty: "implementation"
         prototype: "QQuickAbstractFileDialog"
-        exports: ["QtQuick.PrivateWidgets/QtFileDialog 1.0"]
+        exports: ["QtQuick.Dialogs/AbstractFileDialog 1.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "implementation"; type: "QObject"; isPointer: true }
+        Method { name: "clearSelection" }
+        Method {
+            name: "addSelection"
+            type: "bool"
+            Parameter { name: "path"; type: "string" }
+        }
     }
 }
diff --git a/src/imports/dialogs/qquickplatformcolordialog.cpp b/src/imports/dialogs/qquickplatformcolordialog.cpp
index 491a2e687c..ea3114c86e 100644
--- a/src/imports/dialogs/qquickplatformcolordialog.cpp
+++ b/src/imports/dialogs/qquickplatformcolordialog.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \qmltype ColorDialog
     \instantiates QQuickPlatformColorDialog
     \inqmlmodule QtQuick.Dialogs 1
-    \ingroup qtquick-visual
+    \ingroup dialogs
     \brief Dialog component for choosing a color.
     \since Qt 5.1
 
diff --git a/src/imports/dialogs/qquickplatformfiledialog.cpp b/src/imports/dialogs/qquickplatformfiledialog.cpp
index d767f65499..5ae7fd0067 100644
--- a/src/imports/dialogs/qquickplatformfiledialog.cpp
+++ b/src/imports/dialogs/qquickplatformfiledialog.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \qmltype FileDialog
     \instantiates QQuickPlatformFileDialog
     \inqmlmodule QtQuick.Dialogs 1
-    \ingroup qtquick-visual
+    \ingroup dialogs
     \brief Dialog component for choosing files from a local filesystem.
     \since Qt 5.1
 
diff --git a/src/imports/folderlistmodel/fileinfothread.cpp b/src/imports/folderlistmodel/fileinfothread.cpp
index 64a4b02e91..ad09f54381 100644
--- a/src/imports/folderlistmodel/fileinfothread.cpp
+++ b/src/imports/folderlistmodel/fileinfothread.cpp
@@ -57,7 +57,7 @@ FileInfoThread::FileInfoThread(QObject *parent)
       sortUpdate(false),
       showDirs(true),
       showDirsFirst(false),
-      showDotDot(false),
+      showDotAndDotDot(false),
       showOnlyReadable(false)
 {
 #ifndef QT_NO_FILESYSTEMWATCHER
@@ -158,11 +158,12 @@ void FileInfoThread::setShowDirsFirst(bool show)
     condition.wakeAll();
 }
 
-void FileInfoThread::setShowDotDot(bool on)
+void FileInfoThread::setShowDotAndDotDot(bool on)
 {
     QMutexLocker locker(&mutex);
-    showDotDot = on;
+    showDotAndDotDot = on;
     folderUpdate = true;
+    needUpdate = true;
     condition.wakeAll();
 }
 
@@ -212,10 +213,12 @@ void FileInfoThread::run()
 void FileInfoThread::getFileInfos(const QString &path)
 {
     QDir::Filters filter;
-    filter = QDir::Files | QDir::NoDot | QDir::CaseSensitive;
+    filter = QDir::Files | QDir::CaseSensitive;
     if (showDirs)
         filter = filter | QDir::AllDirs | QDir::Drives;
-    if ((path == rootPath) || !showDotDot)
+    if (!showDotAndDotDot)
+        filter = filter | QDir::NoDot | QDir::NoDotDot;
+    else if (path == rootPath)
         filter = filter | QDir::NoDotDot;
     if (showOnlyReadable)
         filter = filter | QDir::Readable;
diff --git a/src/imports/folderlistmodel/fileinfothread_p.h b/src/imports/folderlistmodel/fileinfothread_p.h
index f9340ca75d..cf6572a279 100644
--- a/src/imports/folderlistmodel/fileinfothread_p.h
+++ b/src/imports/folderlistmodel/fileinfothread_p.h
@@ -72,7 +72,7 @@ public:
     void setNameFilters(const QStringList & nameFilters);
     void setShowDirs(bool showFolders);
     void setShowDirsFirst(bool show);
-    void setShowDotDot(bool on);
+    void setShowDotAndDotDot(bool on);
     void setShowOnlyReadable(bool on);
 
 public Q_SLOTS:
@@ -104,7 +104,7 @@ private:
     bool sortUpdate;
     bool showDirs;
     bool showDirsFirst;
-    bool showDotDot;
+    bool showDotAndDotDot;
     bool showOnlyReadable;
 };
 
diff --git a/src/imports/folderlistmodel/plugins.qmltypes b/src/imports/folderlistmodel/plugins.qmltypes
index fabeb9e4b1..20914f4108 100644
--- a/src/imports/folderlistmodel/plugins.qmltypes
+++ b/src/imports/folderlistmodel/plugins.qmltypes
@@ -3,13 +3,17 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command 'qmlplugindump Qt.labs.folderlistmodel 2.0'.
+// This file was auto-generated with the command 'qmlplugindump -notrelocatable Qt.labs.folderlistmodel 2.0'.
 
 Module {
     Component {
         name: "QQuickFolderListModel"
         prototype: "QAbstractListModel"
-        exports: ["FolderListModel 1.0", "FolderListModel 2.0"]
+        exports: [
+            "Qt.labs.folderlistmodel/FolderListModel 1.0",
+            "Qt.labs.folderlistmodel/FolderListModel 2.0"
+        ]
+        exportMetaObjectRevisions: [0, 0]
         Enum {
             name: "SortField"
             values: {
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 421e215066..85b59e9c73 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -55,7 +55,7 @@ class QQuickFolderListModelPrivate
 public:
     QQuickFolderListModelPrivate(QQuickFolderListModel *q)
         : q_ptr(q),
-          sortField(QQuickFolderListModel::Name), sortReversed(false), showDirs(true), showDirsFirst(false), showDots(false), showOnlyReadable(false)
+          sortField(QQuickFolderListModel::Name), sortReversed(false), showDirs(true), showDirsFirst(false), showDotAndDotDot(false), showOnlyReadable(false)
     {
         nameFilters << QLatin1String("*");
     }
@@ -72,7 +72,7 @@ public:
     bool sortReversed;
     bool showDirs;
     bool showDirsFirst;
-    bool showDots;
+    bool showDotAndDotDot;
     bool showOnlyReadable;
 
     ~QQuickFolderListModelPrivate() {}
@@ -279,7 +279,27 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path)
     The following example shows a FolderListModel being used to provide a list
     of QML files in a \l ListView:
 
-    \snippet qml/folderlistmodel.qml 0
+    \qml
+    import QtQuick 2.0
+    import Qt.labs.folderlistmodel 1.0
+
+    ListView {
+        width: 200; height: 400
+
+        FolderListModel {
+            id: folderModel
+            nameFilters: ["*.qml"]
+        }
+
+        Component {
+            id: fileDelegate
+            Text { text: fileName }
+        }
+
+        model: folderModel
+        delegate: fileDelegate
+    }
+    \endqml
 
     \section1 Path Separators
 
@@ -661,15 +681,15 @@ void  QQuickFolderListModel::setShowDirsFirst(bool on)
 bool QQuickFolderListModel::showDotAndDotDot() const
 {
     Q_D(const QQuickFolderListModel);
-    return d->showDots;
+    return d->showDotAndDotDot;
 }
 
 void  QQuickFolderListModel::setShowDotAndDotDot(bool on)
 {
     Q_D(QQuickFolderListModel);
 
-    if (on != d->showDots) {
-        d->fileInfoThread.setShowDotDot(on);
+    if (on != d->showDotAndDotDot) {
+        d->fileInfoThread.setShowDotAndDotDot(on);
     }
 }
 
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 733c7c47bd..7a922a832e 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -16,4 +16,4 @@ qtHaveModule(quick) {
 
 qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel
 
-qtHaveModule(widgets) : SUBDIRS += widgets
+qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += widgets
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index 9357b5a43c..5bb8099b2e 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -502,7 +502,7 @@ Database connections are automatically closed during Javascript garbage collecti
 
 The API can be used from JavaScript functions in your QML:
 
-\snippet quick/localstorage/localstorage/hello.qml 0
+\snippet localstorage/localstorage/hello.qml 0
 
 The API conforms to the Synchronous API of the HTML5 Web Database API,
 \link http://www.w3.org/TR/2009/WD-webdatabase-20091029/ W3C Working Draft 29 October 2009\endlink.
diff --git a/src/imports/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes
index 107781d6be..bcd516c25e 100644
--- a/src/imports/localstorage/plugins.qmltypes
+++ b/src/imports/localstorage/plugins.qmltypes
@@ -3,13 +3,14 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command 'qmlplugindump QtQuick.LocalStorage 2.0'.
+// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtQuick.LocalStorage 2.0'.
 
 Module {
     Component {
         name: "QQuickLocalStorage"
         prototype: "QObject"
-        exports: ["LocalStorage 2.0"]
+        exports: ["QtQuick.LocalStorage/LocalStorage 2.0"]
+        exportMetaObjectRevisions: [0]
         Method {
             name: "openDatabaseSync"
             Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
diff --git a/src/imports/models/models.pro b/src/imports/models/models.pro
index e96d4b9a44..98b0bd617a 100644
--- a/src/imports/models/models.pro
+++ b/src/imports/models/models.pro
@@ -6,6 +6,6 @@ IMPORT_VERSION = 2.1
 SOURCES += \
     plugin.cpp
 
-QT += qml-private
+QT = qml-private
 
 load(qml_plugin)
diff --git a/src/imports/models/plugin.cpp b/src/imports/models/plugin.cpp
index 2181562098..90e8a56399 100644
--- a/src/imports/models/plugin.cpp
+++ b/src/imports/models/plugin.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     \qmlmodule QtQml.Models 2
-    \title Qt QML Model QML Types
+    \title Qt QML Models QML Types
     \ingroup qmlmodules
     \brief Provides QML types for data models
     \since 5.1
@@ -60,7 +60,8 @@ QT_BEGIN_NAMESPACE
     import QtQml.Models 2.1
     \endcode
 
-    Note that QtQml.Models module started at version 2.1 to match the version of the parent module.
+    Note that QtQml.Models module started at version 2.1 to match the version
+    of the parent module, \l{Qt QML}.
 */
 
 
diff --git a/src/imports/particles/plugins.qmltypes b/src/imports/particles/plugins.qmltypes
index f8acb168b8..495c072a41 100644
--- a/src/imports/particles/plugins.qmltypes
+++ b/src/imports/particles/plugins.qmltypes
@@ -3,14 +3,15 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command 'qmlplugindump QtQuick.Particles 2.0'.
+// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtQuick.Particles 2.0'.
 
 Module {
     Component {
         name: "QQuickAgeAffector"
         defaultProperty: "data"
         prototype: "QQuickParticleAffector"
-        exports: ["Age 2.0"]
+        exports: ["QtQuick.Particles/Age 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "lifeLeft"; type: "int" }
         Property { name: "advancePosition"; type: "bool" }
         Signal {
@@ -33,7 +34,8 @@ Module {
     Component {
         name: "QQuickAngleDirection"
         prototype: "QQuickDirection"
-        exports: ["AngleDirection 2.0"]
+        exports: ["QtQuick.Particles/AngleDirection 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "angle"; type: "double" }
         Property { name: "magnitude"; type: "double" }
         Property { name: "angleVariation"; type: "double" }
@@ -75,7 +77,8 @@ Module {
         name: "QQuickAttractorAffector"
         defaultProperty: "data"
         prototype: "QQuickParticleAffector"
-        exports: ["Attractor 2.0"]
+        exports: ["QtQuick.Particles/Attractor 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Proportion"
             values: {
@@ -144,14 +147,16 @@ Module {
         name: "QQuickCumulativeDirection"
         defaultProperty: "directions"
         prototype: "QQuickDirection"
-        exports: ["CumulativeDirection 2.0"]
+        exports: ["QtQuick.Particles/CumulativeDirection 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "directions"; type: "QQuickDirection"; isList: true; isReadonly: true }
     }
     Component {
         name: "QQuickCustomAffector"
         defaultProperty: "data"
         prototype: "QQuickParticleAffector"
-        exports: ["Affector 2.0"]
+        exports: ["QtQuick.Particles/Affector 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "relative"; type: "bool" }
         Property { name: "position"; type: "QQuickDirection"; isPointer: true }
         Property { name: "velocity"; type: "QQuickDirection"; isPointer: true }
@@ -198,19 +203,22 @@ Module {
         name: "QQuickCustomParticle"
         defaultProperty: "data"
         prototype: "QQuickParticlePainter"
-        exports: ["CustomParticle 2.0"]
+        exports: ["QtQuick.Particles/CustomParticle 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "fragmentShader"; type: "QByteArray" }
         Property { name: "vertexShader"; type: "QByteArray" }
     }
     Component {
         name: "QQuickDirection"
         prototype: "QObject"
-        exports: ["NullVector 2.0"]
+        exports: ["QtQuick.Particles/NullVector 2.0"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickEllipseExtruder"
         prototype: "QQuickParticleExtruder"
-        exports: ["EllipseShape 2.0"]
+        exports: ["QtQuick.Particles/EllipseShape 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "fill"; type: "bool" }
         Signal {
             name: "fillChanged"
@@ -225,7 +233,8 @@ Module {
         name: "QQuickFrictionAffector"
         defaultProperty: "data"
         prototype: "QQuickParticleAffector"
-        exports: ["Friction 2.0"]
+        exports: ["QtQuick.Particles/Friction 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "factor"; type: "double" }
         Property { name: "threshold"; type: "double" }
         Signal {
@@ -249,7 +258,8 @@ Module {
         name: "QQuickGravityAffector"
         defaultProperty: "data"
         prototype: "QQuickParticleAffector"
-        exports: ["Gravity 2.0"]
+        exports: ["QtQuick.Particles/Gravity 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "magnitude"; type: "double" }
         Property { name: "acceleration"; type: "double" }
         Property { name: "angle"; type: "double" }
@@ -278,7 +288,8 @@ Module {
         name: "QQuickGroupGoalAffector"
         defaultProperty: "data"
         prototype: "QQuickParticleAffector"
-        exports: ["GroupGoal 2.0"]
+        exports: ["QtQuick.Particles/GroupGoal 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "goalState"; type: "string" }
         Property { name: "jump"; type: "bool" }
         Signal {
@@ -302,7 +313,8 @@ Module {
         name: "QQuickImageParticle"
         defaultProperty: "data"
         prototype: "QQuickParticlePainter"
-        exports: ["ImageParticle 2.0"]
+        exports: ["QtQuick.Particles/ImageParticle 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Status"
             values: {
@@ -480,7 +492,8 @@ Module {
         name: "QQuickItemParticle"
         defaultProperty: "data"
         prototype: "QQuickParticlePainter"
-        exports: ["ItemParticle 2.0"]
+        exports: ["QtQuick.Particles/ItemParticle 2.0"]
+        exportMetaObjectRevisions: [0]
         attachedType: "QQuickItemParticleAttached"
         Property { name: "fade"; type: "bool" }
         Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
@@ -528,7 +541,8 @@ Module {
     Component {
         name: "QQuickLineExtruder"
         prototype: "QQuickParticleExtruder"
-        exports: ["LineShape 2.0"]
+        exports: ["QtQuick.Particles/LineShape 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "mirrored"; type: "bool" }
         Signal {
             name: "mirroredChanged"
@@ -542,7 +556,8 @@ Module {
     Component {
         name: "QQuickMaskExtruder"
         prototype: "QQuickParticleExtruder"
-        exports: ["MaskShape 2.0"]
+        exports: ["QtQuick.Particles/MaskShape 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "source"; type: "QUrl" }
         Signal {
             name: "sourceChanged"
@@ -557,7 +572,8 @@ Module {
         name: "QQuickParticleAffector"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["ParticleAffector 2.0"]
+        exports: ["QtQuick.Particles/ParticleAffector 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true }
         Property { name: "groups"; type: "QStringList" }
         Property { name: "whenCollidingWith"; type: "QStringList" }
@@ -623,7 +639,8 @@ Module {
         name: "QQuickParticleEmitter"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["Emitter 2.0"]
+        exports: ["QtQuick.Particles/Emitter 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Lifetime"
             values: {
@@ -781,13 +798,15 @@ Module {
     Component {
         name: "QQuickParticleExtruder"
         prototype: "QObject"
-        exports: ["ParticleExtruder 2.0"]
+        exports: ["QtQuick.Particles/ParticleExtruder 2.0"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickParticleGroup"
         defaultProperty: "particleChildren"
         prototype: "QQuickStochasticState"
-        exports: ["ParticleGroup 2.0"]
+        exports: ["QtQuick.Particles/ParticleGroup 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true }
         Property { name: "particleChildren"; type: "QObject"; isList: true; isReadonly: true }
         Signal {
@@ -815,7 +834,8 @@ Module {
         name: "QQuickParticlePainter"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["ParticlePainter 2.0"]
+        exports: ["QtQuick.Particles/ParticlePainter 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true }
         Property { name: "groups"; type: "QStringList" }
         Signal { name: "countChanged" }
@@ -845,7 +865,8 @@ Module {
         name: "QQuickParticleSystem"
         defaultProperty: "data"
         prototype: "QQuickItem"
-        exports: ["ParticleSystem 2.0"]
+        exports: ["QtQuick.Particles/ParticleSystem 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "running"; type: "bool" }
         Property { name: "paused"; type: "bool" }
         Property { name: "empty"; type: "bool"; isReadonly: true }
@@ -881,7 +902,8 @@ Module {
     Component {
         name: "QQuickPointDirection"
         prototype: "QQuickDirection"
-        exports: ["PointDirection 2.0"]
+        exports: ["QtQuick.Particles/PointDirection 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "x"; type: "double" }
         Property { name: "y"; type: "double" }
         Property { name: "xVariation"; type: "double" }
@@ -922,7 +944,8 @@ Module {
     Component {
         name: "QQuickRectangleExtruder"
         prototype: "QQuickParticleExtruder"
-        exports: ["RectangleShape 2.0"]
+        exports: ["QtQuick.Particles/RectangleShape 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "fill"; type: "bool" }
         Signal {
             name: "fillChanged"
@@ -937,7 +960,8 @@ Module {
         name: "QQuickSpriteGoalAffector"
         defaultProperty: "data"
         prototype: "QQuickParticleAffector"
-        exports: ["SpriteGoal 2.0"]
+        exports: ["QtQuick.Particles/SpriteGoal 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "goalState"; type: "string" }
         Property { name: "jump"; type: "bool" }
         Property { name: "systemStates"; type: "bool" }
@@ -969,7 +993,8 @@ Module {
     Component {
         name: "QQuickTargetDirection"
         prototype: "QQuickDirection"
-        exports: ["TargetDirection 2.0"]
+        exports: ["QtQuick.Particles/TargetDirection 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "targetX"; type: "double" }
         Property { name: "targetY"; type: "double" }
         Property { name: "targetItem"; type: "QQuickItem"; isPointer: true }
@@ -1038,7 +1063,8 @@ Module {
         name: "QQuickTrailEmitter"
         defaultProperty: "data"
         prototype: "QQuickParticleEmitter"
-        exports: ["TrailEmitter 2.0"]
+        exports: ["QtQuick.Particles/TrailEmitter 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "EmitSize"
             values: {
@@ -1100,7 +1126,8 @@ Module {
         name: "QQuickTurbulenceAffector"
         defaultProperty: "data"
         prototype: "QQuickParticleAffector"
-        exports: ["Turbulence 2.0"]
+        exports: ["QtQuick.Particles/Turbulence 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "strength"; type: "double" }
         Property { name: "noiseSource"; type: "QUrl" }
         Signal {
@@ -1124,7 +1151,8 @@ Module {
         name: "QQuickWanderAffector"
         defaultProperty: "data"
         prototype: "QQuickParticleAffector"
-        exports: ["Wander 2.0"]
+        exports: ["QtQuick.Particles/Wander 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "AffectableParameters"
             values: {
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index aa24e39f85..02c7d61536 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -3,12 +3,20 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command 'qmlplugindump -builtins'.
+// This file was auto-generated with the command 'qmlplugindump -notrelocatable -builtins'.
 
 Module {
     Component {
         name: "QAbstractItemModel"
         prototype: "QObject"
+        Enum {
+            name: "LayoutChangeHint"
+            values: {
+                "NoLayoutChangeHint": 0,
+                "VerticalSortHint": 1,
+                "HorizontalSortHint": 2
+            }
+        }
         Signal {
             name: "dataChanged"
             Parameter { name: "topLeft"; type: "QModelIndex" }
@@ -167,6 +175,7 @@ Module {
         name: "QInputMethod"
         prototype: "QObject"
         exports: ["QtQuick/InputMethod 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Action"
             values: {
@@ -215,6 +224,7 @@ Module {
     Component {
         name: "QObject"
         exports: ["QtQml/QtObject 2.0", "QtQuick/QtObject 2.0"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "objectName"; type: "string" }
         Signal {
             name: "objectNameChanged"
@@ -228,9 +238,26 @@ Module {
         }
     }
     Component {
+        name: "QQmlApplication"
+        prototype: "QObject"
+        Property { name: "arguments"; type: "QStringList"; isReadonly: true }
+        Property { name: "name"; type: "string" }
+        Property { name: "version"; type: "string" }
+        Signal { name: "aboutToQuit" }
+        Method {
+            name: "setName"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setVersion"
+            Parameter { name: "arg"; type: "string" }
+        }
+    }
+    Component {
         name: "QQmlBind"
         prototype: "QObject"
         exports: ["QtQml/Binding 2.0", "QtQuick/Binding 2.0"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "target"; type: "QObject"; isPointer: true }
         Property { name: "property"; type: "string" }
         Property { name: "value"; type: "QVariant" }
@@ -244,6 +271,7 @@ Module {
             "QtQml/Component 2.0",
             "QtQuick/Component 2.0"
         ]
+        exportMetaObjectRevisions: [0, 0, 0]
         attachedType: "QQmlComponentAttached"
         Enum {
             name: "CompilationMode"
@@ -298,13 +326,105 @@ Module {
         name: "QQmlConnections"
         prototype: "QObject"
         exports: ["QtQml/Connections 2.0", "QtQuick/Connections 2.0"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "target"; type: "QObject"; isPointer: true }
         Property { name: "ignoreUnknownSignals"; type: "bool" }
     }
     Component {
+        name: "QQmlDelegateModel"
+        defaultProperty: "delegate"
+        prototype: "QQmlInstanceModel"
+        exports: ["QtQuick/VisualDataModel 2.0"]
+        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: ["QtQuick/VisualDataGroup 2.0"]
+        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: "QQmlV8Handle" }
+            Parameter { name: "inserted"; type: "QQmlV8Handle" }
+        }
+        Method {
+            name: "insert"
+            Parameter { type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "create"
+            Parameter { type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "resolve"
+            Parameter { type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "remove"
+            Parameter { type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "addGroups"
+            Parameter { type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "removeGroups"
+            Parameter { type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "setGroups"
+            Parameter { type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "move"
+            Parameter { type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "get"
+            type: "QQmlV8Handle"
+            Parameter { name: "index"; type: "int" }
+        }
+    }
+    Component { name: "QQmlDelegateModelParts"; prototype: "QObject" }
+    Component {
         name: "QQmlEasingValueType"
         prototype: "QQmlValueType"
         exports: ["QtQuick/Easing 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Type"
             values: {
@@ -363,8 +483,111 @@ 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: ["QtQml/Instantiator 2.1", "QtQuick/Instantiator 2.1"]
+        exportMetaObjectRevisions: [0, 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"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "QQmlListModel"
+        prototype: "QAbstractListModel"
+        exports: ["QtQuick/ListModel 2.0"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Property { name: "dynamicRoles"; type: "bool" }
+        Method { name: "clear" }
+        Method {
+            name: "remove"
+            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "append"
+            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "insert"
+            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+        }
+        Method {
+            name: "get"
+            type: "QQmlV8Handle"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "set"
+            Parameter { name: "index"; type: "int" }
+            Parameter { type: "QQmlV8Handle" }
+        }
+        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: "QQmlLocale"
         exports: ["QtQuick/Locale 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "MeasurementSystem"
             values: {
@@ -404,9 +627,24 @@ Module {
         }
     }
     Component {
+        name: "QQmlObjectModel"
+        defaultProperty: "children"
+        prototype: "QQmlInstanceModel"
+        exports: ["QtQuick/VisualItemModel 2.0"]
+        exportMetaObjectRevisions: [0]
+        attachedType: "QQmlObjectModelAttached"
+        Property { name: "children"; type: "QObject"; isList: true; isReadonly: true }
+    }
+    Component {
+        name: "QQmlObjectModelAttached"
+        prototype: "QObject"
+        Property { name: "index"; type: "int"; isReadonly: true }
+    }
+    Component {
         name: "QQmlTimer"
         prototype: "QObject"
         exports: ["QtQml/Timer 2.0", "QtQuick/Timer 2.0"]
+        exportMetaObjectRevisions: [0, 0]
         Property { name: "interval"; type: "int" }
         Property { name: "running"; type: "bool" }
         Property { name: "repeat"; type: "bool" }
@@ -422,6 +660,7 @@ Module {
         name: "QQuickAbstractAnimation"
         prototype: "QObject"
         exports: ["QtQuick/Animation 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Loops"
             values: {
@@ -461,14 +700,18 @@ Module {
         name: "QQuickAccessibleAttached"
         prototype: "QObject"
         exports: ["QtQuick/Accessible 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "role"; type: "QAccessible::Role" }
         Property { name: "name"; type: "string" }
         Property { name: "description"; type: "string" }
+        Method { name: "valueChanged" }
+        Method { name: "cursorPositionChanged" }
     }
     Component {
         name: "QQuickAnchorAnimation"
         prototype: "QQuickAbstractAnimation"
         exports: ["QtQuick/AnchorAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "targets"; type: "QQuickItem"; isList: true; isReadonly: true }
         Property { name: "duration"; type: "int" }
         Property { name: "easing"; type: "QEasingCurve" }
@@ -485,6 +728,7 @@ Module {
         name: "QQuickAnchorChanges"
         prototype: "QQuickStateOperation"
         exports: ["QtQuick/AnchorChanges 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "target"; type: "QQuickItem"; isPointer: true }
         Property { name: "anchors"; type: "QQuickAnchorSet"; isReadonly: true; isPointer: true }
     }
@@ -527,6 +771,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickImage"
         exports: ["QtQuick/AnimatedImage 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "playing"; type: "bool" }
         Property { name: "paused"; type: "bool" }
         Property { name: "currentFrame"; type: "int" }
@@ -539,6 +784,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/AnimatedSprite 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "LoopParameters"
             values: {
@@ -698,6 +944,7 @@ Module {
         defaultProperty: "animation"
         prototype: "QObject"
         exports: ["QtQuick/AnimationController 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "progress"; type: "double" }
         Property { name: "animation"; type: "QQuickAbstractAnimation"; isPointer: true }
         Method { name: "reload" }
@@ -712,8 +959,9 @@ Module {
     }
     Component {
         name: "QQuickApplication"
-        prototype: "QObject"
+        prototype: "QQmlApplication"
         exports: ["QtQuick/Application 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "active"; type: "bool"; isReadonly: true }
         Property { name: "layoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
         Property { name: "supportsMultipleWindows"; type: "bool"; isReadonly: true }
@@ -723,6 +971,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickImplicitSizeItem"
         exports: ["QtQuick/Positioner 2.0"]
+        exportMetaObjectRevisions: [0]
         attachedType: "QQuickPositionerAttached"
         Property { name: "spacing"; type: "double" }
         Property { name: "populate"; type: "QQuickTransition"; isPointer: true }
@@ -734,6 +983,7 @@ Module {
         defaultProperty: "animation"
         prototype: "QObject"
         exports: ["QtQuick/Behavior 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "animation"; type: "QQuickAbstractAnimation"; isPointer: true }
         Property { name: "enabled"; type: "bool" }
     }
@@ -742,6 +992,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickImageBase"
         exports: ["QtQuick/BorderImage 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "TileMode"
             values: {
@@ -760,6 +1011,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/Canvas 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "RenderTarget"
             values: {
@@ -846,6 +1098,7 @@ Module {
         name: "QQuickColorAnimation"
         prototype: "QQuickPropertyAnimation"
         exports: ["QtQuick/ColorAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "from"; type: "QColor" }
         Property { name: "to"; type: "QColor" }
     }
@@ -854,6 +1107,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickBasePositioner"
         exports: ["QtQuick/Column 2.0"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickCurve"
@@ -867,6 +1121,7 @@ Module {
         name: "QQuickDoubleValidator"
         prototype: "QDoubleValidator"
         exports: ["QtQuick/DoubleValidator 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "locale"; type: "string" }
         Signal { name: "localeNameChanged" }
     }
@@ -874,13 +1129,15 @@ Module {
         name: "QQuickDrag"
         prototype: "QObject"
         exports: ["QtQuick/Drag 2.0"]
+        exportMetaObjectRevisions: [0]
         attachedType: "QQuickDragAttached"
         Enum {
             name: "Axis"
             values: {
                 "XAxis": 1,
                 "YAxis": 2,
-                "XAndYAxis": 3
+                "XAndYAxis": 3,
+                "XandYAxis": 3
             }
         }
         Property { name: "target"; type: "QQuickItem"; isPointer: true }
@@ -914,6 +1171,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/DropArea 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "containsDrag"; type: "bool"; isReadonly: true }
         Property { name: "keys"; type: "QStringList" }
         Property { name: "drag"; type: "QQuickDropAreaDrag"; isReadonly: true; isPointer: true }
@@ -945,6 +1203,7 @@ Module {
         defaultProperty: "flickableData"
         prototype: "QQuickItem"
         exports: ["QtQuick/Flickable 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "BoundsBehavior"
             values: {
@@ -1054,6 +1313,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/Flipable 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Side"
             values: {
@@ -1070,6 +1330,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickBasePositioner"
         exports: ["QtQuick/Flow 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Flow"
             values: {
@@ -1086,11 +1347,13 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/FocusScope 2.0"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickFontLoader"
         prototype: "QObject"
         exports: ["QtQuick/FontLoader 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Status"
             values: {
@@ -1108,6 +1371,7 @@ Module {
         name: "QQuickFontValueType"
         prototype: "QQmlValueType"
         exports: ["QtQuick/Font 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "FontWeight"
             values: {
@@ -1146,6 +1410,7 @@ Module {
         defaultProperty: "stops"
         prototype: "QObject"
         exports: ["QtQuick/Gradient 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "stops"; type: "QQuickGradientStop"; isList: true; isReadonly: true }
         Signal { name: "updated" }
     }
@@ -1153,6 +1418,7 @@ Module {
         name: "QQuickGradientStop"
         prototype: "QObject"
         exports: ["QtQuick/GradientStop 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "position"; type: "double" }
         Property { name: "color"; type: "QColor" }
     }
@@ -1160,7 +1426,8 @@ Module {
         name: "QQuickGrid"
         defaultProperty: "data"
         prototype: "QQuickBasePositioner"
-        exports: ["QtQuick/Grid 2.0"]
+        exports: ["QtQuick/Grid 2.0", "QtQuick/Grid 2.1"]
+        exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "Flow"
             values: {
@@ -1168,6 +1435,22 @@ Module {
                 "TopToBottom": 1
             }
         }
+        Enum {
+            name: "HAlignment"
+            values: {
+                "AlignLeft": 1,
+                "AlignRight": 2,
+                "AlignHCenter": 4
+            }
+        }
+        Enum {
+            name: "VAlignment"
+            values: {
+                "AlignTop": 32,
+                "AlignBottom": 64,
+                "AlignVCenter": 128
+            }
+        }
         Property { name: "rows"; type: "int" }
         Property { name: "columns"; type: "int" }
         Property { name: "rowSpacing"; type: "double" }
@@ -1175,18 +1458,43 @@ Module {
         Property { name: "flow"; type: "Flow" }
         Property { name: "layoutDirection"; type: "Qt::LayoutDirection" }
         Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
+        Property { name: "horizontalItemAlignment"; revision: 1; type: "HAlignment" }
+        Property {
+            name: "effectiveHorizontalItemAlignment"
+            revision: 1
+            type: "HAlignment"
+            isReadonly: true
+        }
+        Property { name: "verticalItemAlignment"; revision: 1; type: "VAlignment" }
+        Signal {
+            name: "horizontalAlignmentChanged"
+            revision: 1
+            Parameter { name: "alignment"; type: "HAlignment" }
+        }
+        Signal {
+            name: "effectiveHorizontalAlignmentChanged"
+            revision: 1
+            Parameter { name: "alignment"; type: "HAlignment" }
+        }
+        Signal {
+            name: "verticalAlignmentChanged"
+            revision: 1
+            Parameter { name: "alignment"; type: "VAlignment" }
+        }
     }
     Component {
         name: "QQuickGridMesh"
         prototype: "QQuickShaderEffectMesh"
         exports: ["QtQuick/GridMesh 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "resolution"; type: "QSize" }
     }
     Component {
         name: "QQuickGridView"
         defaultProperty: "data"
         prototype: "QQuickItemView"
-        exports: ["QtQuick/GridView 2.0"]
+        exports: ["QtQuick/GridView 2.0", "QtQuick/GridView 2.1"]
+        exportMetaObjectRevisions: [0, 1]
         attachedType: "QQuickGridViewAttached"
         Enum {
             name: "Flow"
@@ -1223,6 +1531,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickImageBase"
         exports: ["QtQuick/Image 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "HAlignment"
             values: {
@@ -1305,11 +1614,14 @@ Module {
         prototype: "QQuickItem"
         Property { name: "implicitWidth"; type: "double"; isReadonly: true }
         Property { name: "implicitHeight"; type: "double"; isReadonly: true }
+        Signal { name: "implicitWidthChanged2"; revision: 1 }
+        Signal { name: "implicitHeightChanged2"; revision: 1 }
     }
     Component {
         name: "QQuickIntValidator"
         prototype: "QIntValidator"
         exports: ["QtQuick/IntValidator 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "locale"; type: "string" }
         Signal { name: "localeNameChanged" }
     }
@@ -1317,7 +1629,8 @@ Module {
         name: "QQuickItem"
         defaultProperty: "data"
         prototype: "QObject"
-        exports: ["QtQuick/Item 2.0"]
+        exports: ["QtQuick/Item 2.0", "QtQuick/Item 2.1"]
+        exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "TransformOrigin"
             values: {
@@ -1361,6 +1674,7 @@ Module {
         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" }
@@ -1392,6 +1706,11 @@ Module {
             Parameter { type: "bool" }
         }
         Signal {
+            name: "activeFocusOnTabChanged"
+            revision: 1
+            Parameter { type: "bool" }
+        }
+        Signal {
             name: "parentChanged"
             Parameter { type: "QQuickItem"; isPointer: true }
         }
@@ -1411,6 +1730,11 @@ Module {
             name: "clipChanged"
             Parameter { type: "bool" }
         }
+        Signal {
+            name: "windowChanged"
+            revision: 1
+            Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
+        }
         Method { name: "update" }
         Method {
             name: "contains"
@@ -1427,6 +1751,16 @@ Module {
         }
         Method { name: "forceActiveFocus" }
         Method {
+            name: "forceActiveFocus"
+            Parameter { name: "reason"; type: "Qt::FocusReason" }
+        }
+        Method {
+            name: "nextItemInFocusChain"
+            type: "QQuickItem*"
+            Parameter { name: "forward"; type: "bool" }
+        }
+        Method { name: "nextItemInFocusChain"; type: "QQuickItem*" }
+        Method {
             name: "childAt"
             type: "QQuickItem*"
             Parameter { name: "x"; type: "double" }
@@ -1486,6 +1820,8 @@ Module {
         name: "QQuickItemView"
         defaultProperty: "flickableData"
         prototype: "QQuickFlickable"
+        exports: ["QtQuick/ItemView 2.1"]
+        exportMetaObjectRevisions: [1]
         Enum {
             name: "LayoutDirection"
             values: {
@@ -1577,6 +1913,7 @@ Module {
         }
         Method { name: "positionViewAtBeginning" }
         Method { name: "positionViewAtEnd" }
+        Method { name: "forceLayout"; revision: 1 }
     }
     Component {
         name: "QQuickItemViewAttached"
@@ -1595,6 +1932,7 @@ Module {
         name: "QQuickKeyNavigationAttached"
         prototype: "QObject"
         exports: ["QtQuick/KeyNavigation 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Priority"
             values: {
@@ -1614,6 +1952,7 @@ Module {
         name: "QQuickKeysAttached"
         prototype: "QObject"
         exports: ["QtQuick/Keys 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Priority"
             values: {
@@ -1789,62 +2128,16 @@ Module {
         name: "QQuickLayoutMirroringAttached"
         prototype: "QObject"
         exports: ["QtQuick/LayoutMirroring 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "enabled"; type: "bool" }
         Property { name: "childrenInherit"; type: "bool" }
     }
     Component {
-        name: "QQuickListElement"
-        prototype: "QObject"
-        exports: ["QtQuick/ListElement 2.0"]
-    }
-    Component {
-        name: "QQuickListModel"
-        prototype: "QAbstractListModel"
-        exports: ["QtQuick/ListModel 2.0"]
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "dynamicRoles"; type: "bool" }
-        Method { name: "clear" }
-        Method {
-            name: "remove"
-            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
-        }
-        Method {
-            name: "append"
-            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
-        }
-        Method {
-            name: "insert"
-            Parameter { name: "args"; type: "QQmlV8Function"; 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: "QQuickListView"
         defaultProperty: "data"
         prototype: "QQuickItemView"
-        exports: ["QtQuick/ListView 2.0"]
+        exports: ["QtQuick/ListView 2.0", "QtQuick/ListView 2.1"]
+        exportMetaObjectRevisions: [0, 1]
         attachedType: "QQuickListViewAttached"
         Enum {
             name: "Orientation"
@@ -1882,6 +2175,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickImplicitSizeItem"
         exports: ["QtQuick/Loader 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Status"
             values: {
@@ -1909,6 +2203,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/MouseArea 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "mouseX"; type: "double"; isReadonly: true }
         Property { name: "mouseY"; type: "double"; isReadonly: true }
         Property { name: "containsMouse"; type: "bool"; isReadonly: true }
@@ -1979,6 +2274,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/MultiPointTouchArea 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "touchPoints"; type: "QQuickTouchPoint"; isList: true; isReadonly: true }
         Property { name: "minimumTouchPoints"; type: "int" }
         Property { name: "maximumTouchPoints"; type: "int" }
@@ -2011,6 +2307,7 @@ Module {
         name: "QQuickNumberAnimation"
         prototype: "QQuickPropertyAnimation"
         exports: ["QtQuick/NumberAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "from"; type: "double" }
         Property { name: "to"; type: "double" }
     }
@@ -2019,6 +2316,7 @@ Module {
         defaultProperty: "data"
         prototype: "QObject"
         exports: ["QtQuick/Package 2.0"]
+        exportMetaObjectRevisions: [0]
         attachedType: "QQuickPackageAttached"
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
     }
@@ -2032,6 +2330,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/PaintedItem 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "RenderTarget"
             values: {
@@ -2050,12 +2349,14 @@ Module {
         defaultProperty: "animations"
         prototype: "QQuickAnimationGroup"
         exports: ["QtQuick/ParallelAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickParentAnimation"
         defaultProperty: "animations"
         prototype: "QQuickAnimationGroup"
         exports: ["QtQuick/ParentAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "target"; type: "QQuickItem"; isPointer: true }
         Property { name: "newParent"; type: "QQuickItem"; isPointer: true }
         Property { name: "via"; type: "QQuickItem"; isPointer: true }
@@ -2064,6 +2365,7 @@ Module {
         name: "QQuickParentChange"
         prototype: "QQuickStateOperation"
         exports: ["QtQuick/ParentChange 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "target"; type: "QQuickItem"; isPointer: true }
         Property { name: "parent"; type: "QQuickItem"; isPointer: true }
         Property { name: "x"; type: "QQmlScriptString" }
@@ -2078,6 +2380,7 @@ Module {
         defaultProperty: "pathElements"
         prototype: "QObject"
         exports: ["QtQuick/Path 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "pathElements"; type: "QQuickPathElement"; isList: true; isReadonly: true }
         Property { name: "startX"; type: "double" }
         Property { name: "startY"; type: "double" }
@@ -2088,6 +2391,7 @@ Module {
         name: "QQuickPathAnimation"
         prototype: "QQuickAbstractAnimation"
         exports: ["QtQuick/PathAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Orientation"
             values: {
@@ -2140,6 +2444,7 @@ Module {
         name: "QQuickPathArc"
         prototype: "QQuickCurve"
         exports: ["QtQuick/PathArc 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "ArcDirection"
             values: {
@@ -2156,6 +2461,7 @@ Module {
         name: "QQuickPathAttribute"
         prototype: "QQuickPathElement"
         exports: ["QtQuick/PathAttribute 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "name"; type: "string" }
         Property { name: "value"; type: "double" }
     }
@@ -2163,11 +2469,13 @@ Module {
         name: "QQuickPathCatmullRomCurve"
         prototype: "QQuickCurve"
         exports: ["QtQuick/PathCurve 2.0"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickPathCubic"
         prototype: "QQuickCurve"
         exports: ["QtQuick/PathCubic 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "control1X"; type: "double" }
         Property { name: "control1Y"; type: "double" }
         Property { name: "control2X"; type: "double" }
@@ -2186,6 +2494,7 @@ Module {
         name: "QQuickPathInterpolator"
         prototype: "QObject"
         exports: ["QtQuick/PathInterpolator 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "path"; type: "QQuickPath"; isPointer: true }
         Property { name: "progress"; type: "double" }
         Property { name: "x"; type: "double"; isReadonly: true }
@@ -2196,17 +2505,20 @@ Module {
         name: "QQuickPathLine"
         prototype: "QQuickCurve"
         exports: ["QtQuick/PathLine 2.0"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickPathPercent"
         prototype: "QQuickPathElement"
         exports: ["QtQuick/PathPercent 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "value"; type: "double" }
     }
     Component {
         name: "QQuickPathQuad"
         prototype: "QQuickCurve"
         exports: ["QtQuick/PathQuad 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "controlX"; type: "double" }
         Property { name: "controlY"; type: "double" }
         Property { name: "relativeControlX"; type: "double" }
@@ -2216,6 +2528,7 @@ Module {
         name: "QQuickPathSvg"
         prototype: "QQuickCurve"
         exports: ["QtQuick/PathSvg 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "path"; type: "string" }
     }
     Component {
@@ -2223,6 +2536,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/PathView 2.0"]
+        exportMetaObjectRevisions: [0]
         attachedType: "QQuickPathViewAttached"
         Enum {
             name: "HighlightRangeMode"
@@ -2313,6 +2627,7 @@ Module {
         name: "QQuickPauseAnimation"
         prototype: "QQuickAbstractAnimation"
         exports: ["QtQuick/PauseAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "duration"; type: "int" }
         Signal {
             name: "durationChanged"
@@ -2331,13 +2646,15 @@ Module {
         name: "QQuickPinch"
         prototype: "QObject"
         exports: ["QtQuick/Pinch 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Axis"
             values: {
                 "NoDrag": 0,
                 "XAxis": 1,
                 "YAxis": 2,
-                "XAndYAxis": 3
+                "XAndYAxis": 3,
+                "XandYAxis": 3
             }
         }
         Property { name: "target"; type: "QQuickItem"; isPointer: true }
@@ -2357,6 +2674,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/PinchArea 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "enabled"; type: "bool" }
         Property { name: "pinch"; type: "QQuickPinch"; isReadonly: true; isPointer: true }
         Signal {
@@ -2383,6 +2701,7 @@ Module {
         name: "QQuickPropertyAction"
         prototype: "QQuickAbstractAnimation"
         exports: ["QtQuick/PropertyAction 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "target"; type: "QObject"; isPointer: true }
         Property { name: "property"; type: "string" }
         Property { name: "properties"; type: "string" }
@@ -2402,6 +2721,7 @@ Module {
         name: "QQuickPropertyAnimation"
         prototype: "QQuickAbstractAnimation"
         exports: ["QtQuick/PropertyAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "duration"; type: "int" }
         Property { name: "from"; type: "QVariant" }
         Property { name: "to"; type: "QVariant" }
@@ -2436,6 +2756,7 @@ Module {
         name: "QQuickPropertyChanges"
         prototype: "QQuickStateOperation"
         exports: ["QtQuick/PropertyChanges 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "target"; type: "QObject"; isPointer: true }
         Property { name: "restoreEntryValues"; type: "bool" }
         Property { name: "explicit"; type: "bool" }
@@ -2445,6 +2766,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/Rectangle 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "color"; type: "QColor" }
         Property { name: "gradient"; type: "QQuickGradient"; isPointer: true }
         Property { name: "border"; type: "QQuickPen"; isReadonly: true; isPointer: true }
@@ -2455,6 +2777,7 @@ Module {
         defaultProperty: "delegate"
         prototype: "QQuickItem"
         exports: ["QtQuick/Repeater 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "model"; type: "QVariant" }
         Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
         Property { name: "count"; type: "int"; isReadonly: true }
@@ -2478,6 +2801,7 @@ Module {
         name: "QQuickRotation"
         prototype: "QQuickTransform"
         exports: ["QtQuick/Rotation 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "origin"; type: "QVector3D" }
         Property { name: "angle"; type: "double" }
         Property { name: "axis"; type: "QVector3D" }
@@ -2486,6 +2810,7 @@ Module {
         name: "QQuickRotationAnimation"
         prototype: "QQuickPropertyAnimation"
         exports: ["QtQuick/RotationAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "RotationDirection"
             values: {
@@ -2504,6 +2829,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickBasePositioner"
         exports: ["QtQuick/Row 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "layoutDirection"; type: "Qt::LayoutDirection" }
         Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
     }
@@ -2511,6 +2837,7 @@ Module {
         name: "QQuickScale"
         prototype: "QQuickTransform"
         exports: ["QtQuick/Scale 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "origin"; type: "QVector3D" }
         Property { name: "xScale"; type: "double" }
         Property { name: "yScale"; type: "double" }
@@ -2530,6 +2857,7 @@ Module {
         name: "QQuickScriptAction"
         prototype: "QQuickAbstractAnimation"
         exports: ["QtQuick/ScriptAction 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "script"; type: "QQmlScriptString" }
         Property { name: "scriptName"; type: "string" }
     }
@@ -2538,12 +2866,14 @@ Module {
         defaultProperty: "animations"
         prototype: "QQuickAnimationGroup"
         exports: ["QtQuick/SequentialAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
     }
     Component {
         name: "QQuickShaderEffect"
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/ShaderEffect 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "CullMode"
             values: {
@@ -2572,6 +2902,7 @@ Module {
         name: "QQuickShaderEffectMesh"
         prototype: "QObject"
         exports: ["QtQuick/ShaderEffectMesh 2.0"]
+        exportMetaObjectRevisions: [0]
         Signal { name: "geometryChanged" }
     }
     Component {
@@ -2579,6 +2910,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickItem"
         exports: ["QtQuick/ShaderEffectSource 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "WrapMode"
             values: {
@@ -2612,6 +2944,7 @@ Module {
         name: "QQuickSmoothedAnimation"
         prototype: "QQuickNumberAnimation"
         exports: ["QtQuick/SmoothedAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "ReversingMode"
             values: {
@@ -2628,6 +2961,7 @@ Module {
         name: "QQuickSpringAnimation"
         prototype: "QQuickNumberAnimation"
         exports: ["QtQuick/SpringAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "velocity"; type: "double" }
         Property { name: "spring"; type: "double" }
         Property { name: "damping"; type: "double" }
@@ -2640,6 +2974,7 @@ Module {
         name: "QQuickSprite"
         prototype: "QQuickStochasticState"
         exports: ["QtQuick/Sprite 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "source"; type: "QUrl" }
         Property { name: "reverse"; type: "bool" }
         Property { name: "frameSync"; type: "bool" }
@@ -2759,6 +3094,7 @@ Module {
         defaultProperty: "sprites"
         prototype: "QQuickItem"
         exports: ["QtQuick/SpriteSequence 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "running"; type: "bool" }
         Property { name: "interpolate"; type: "bool" }
         Property { name: "goalSprite"; type: "string" }
@@ -2802,6 +3138,7 @@ Module {
         defaultProperty: "changes"
         prototype: "QObject"
         exports: ["QtQuick/State 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "name"; type: "string" }
         Property { name: "when"; type: "QQmlBinding"; isPointer: true }
         Property { name: "extend"; type: "string" }
@@ -2812,6 +3149,7 @@ Module {
         name: "QQuickStateChangeScript"
         prototype: "QQuickStateOperation"
         exports: ["QtQuick/StateChangeScript 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "script"; type: "QQmlScriptString" }
         Property { name: "name"; type: "string" }
     }
@@ -2819,6 +3157,7 @@ Module {
         name: "QQuickStateGroup"
         prototype: "QObject"
         exports: ["QtQuick/StateGroup 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "state"; type: "string" }
         Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
         Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
@@ -2882,6 +3221,7 @@ Module {
         name: "QQuickSystemPalette"
         prototype: "QObject"
         exports: ["QtQuick/SystemPalette 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "ColorGroup"
             values: {
@@ -2912,6 +3252,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickImplicitSizeItem"
         exports: ["QtQuick/Text 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "HAlignment"
             values: {
@@ -3062,11 +3403,13 @@ Module {
         }
         Method { name: "doLayout" }
     }
+    Component { name: "QQuickTextDocument"; prototype: "QObject" }
     Component {
         name: "QQuickTextEdit"
         defaultProperty: "data"
         prototype: "QQuickImplicitSizeItem"
-        exports: ["QtQuick/TextEdit 2.0"]
+        exports: ["QtQuick/TextEdit 2.0", "QtQuick/TextEdit 2.1"]
+        exportMetaObjectRevisions: [0, 1]
         Enum {
             name: "HAlignment"
             values: {
@@ -3144,6 +3487,7 @@ Module {
         Property { name: "persistentSelection"; type: "bool" }
         Property { name: "textMargin"; type: "double" }
         Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" }
+        Property { name: "selectByKeyboard"; revision: 1; type: "bool" }
         Property { name: "selectByMouse"; type: "bool" }
         Property { name: "mouseSelectionMode"; type: "SelectionMode" }
         Property { name: "canPaste"; type: "bool"; isReadonly: true }
@@ -3152,6 +3496,13 @@ Module {
         Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true }
         Property { name: "baseUrl"; type: "QUrl" }
         Property { name: "renderType"; type: "RenderType" }
+        Property {
+            name: "textDocument"
+            revision: 1
+            type: "QQuickTextDocument"
+            isReadonly: true
+            isPointer: true
+        }
         Signal { name: "contentSizeChanged" }
         Signal {
             name: "colorChanged"
@@ -3202,6 +3553,11 @@ Module {
             Parameter { name: "textMargin"; type: "double" }
         }
         Signal {
+            name: "selectByKeyboardChanged"
+            revision: 1
+            Parameter { name: "selectByKeyboard"; type: "bool" }
+        }
+        Signal {
             name: "selectByMouseChanged"
             Parameter { name: "selectByMouse"; type: "bool" }
         }
@@ -3280,6 +3636,7 @@ Module {
         defaultProperty: "data"
         prototype: "QQuickImplicitSizeItem"
         exports: ["QtQuick/TextInput 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "EchoMode"
             values: {
@@ -3482,6 +3839,7 @@ Module {
         name: "QQuickTouchPoint"
         prototype: "QObject"
         exports: ["QtQuick/TouchPoint 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "pointId"; type: "int"; isReadonly: true }
         Property { name: "pressed"; type: "bool"; isReadonly: true }
         Property { name: "x"; type: "double"; isReadonly: true }
@@ -3502,6 +3860,7 @@ Module {
         defaultProperty: "animations"
         prototype: "QObject"
         exports: ["QtQuick/Transition 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "from"; type: "string" }
         Property { name: "to"; type: "string" }
         Property { name: "reversible"; type: "bool" }
@@ -3513,6 +3872,7 @@ Module {
         name: "QQuickTranslate"
         prototype: "QQuickTransform"
         exports: ["QtQuick/Translate 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "x"; type: "double" }
         Property { name: "y"; type: "double" }
     }
@@ -3520,6 +3880,7 @@ Module {
         name: "QQuickVector3dAnimation"
         prototype: "QQuickPropertyAnimation"
         exports: ["QtQuick/Vector3dAnimation 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "from"; type: "QVector3D" }
         Property { name: "to"; type: "QVector3D" }
     }
@@ -3527,6 +3888,7 @@ Module {
         name: "QQuickViewSection"
         prototype: "QObject"
         exports: ["QtQuick/ViewSection 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "SectionCriteria"
             values: {
@@ -3552,6 +3914,7 @@ Module {
         name: "QQuickViewTransitionAttached"
         prototype: "QObject"
         exports: ["QtQuick/ViewTransition 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "index"; type: "int"; isReadonly: true }
         Property { name: "item"; type: "QQuickItem"; isReadonly: true; isPointer: true }
         Property { name: "destination"; type: "QPointF"; isReadonly: true }
@@ -3559,134 +3922,10 @@ Module {
         Property { name: "targetItems"; type: "QObject"; isList: true; isReadonly: true }
     }
     Component {
-        name: "QQuickVisualDataGroup"
-        prototype: "QObject"
-        exports: ["QtQuick/VisualDataGroup 2.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: "QQmlV8Function"; isPointer: true }
-        }
-        Method {
-            name: "create"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
-        }
-        Method {
-            name: "resolve"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
-        }
-        Method {
-            name: "remove"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
-        }
-        Method {
-            name: "addGroups"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
-        }
-        Method {
-            name: "removeGroups"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
-        }
-        Method {
-            name: "setGroups"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
-        }
-        Method {
-            name: "move"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
-        }
-        Method {
-            name: "get"
-            type: "QQmlV4Handle"
-            Parameter { name: "index"; type: "int" }
-        }
-    }
-    Component {
-        name: "QQuickVisualDataModel"
-        defaultProperty: "delegate"
-        prototype: "QQuickVisualModel"
-        exports: ["QtQuick/VisualDataModel 2.0"]
-        attachedType: "QQuickVisualDataModelAttached"
-        Property { name: "model"; type: "QVariant" }
-        Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
-        Property { name: "filterOnGroup"; type: "string" }
-        Property { name: "items"; type: "QQuickVisualDataGroup"; isReadonly: true; isPointer: true }
-        Property {
-            name: "persistedItems"
-            type: "QQuickVisualDataGroup"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "groups"; type: "QQuickVisualDataGroup"; 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: "QQuickVisualDataModelAttached"
-        prototype: "QObject"
-        Property { name: "model"; type: "QQuickVisualDataModel"; isReadonly: true; isPointer: true }
-        Property { name: "groups"; type: "QStringList" }
-        Property { name: "isUnresolved"; type: "bool"; isReadonly: true }
-        Signal { name: "unresolvedChanged" }
-    }
-    Component { name: "QQuickVisualDataModelParts"; prototype: "QObject" }
-    Component {
-        name: "QQuickVisualItemModel"
-        defaultProperty: "children"
-        prototype: "QQuickVisualModel"
-        exports: ["QtQuick/VisualItemModel 2.0"]
-        attachedType: "QQuickVisualItemModelAttached"
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-    }
-    Component {
-        name: "QQuickVisualItemModelAttached"
-        prototype: "QObject"
-        Property { name: "index"; type: "int"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickVisualModel"
-        prototype: "QObject"
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Signal {
-            name: "modelUpdated"
-            Parameter { name: "changeSet"; type: "QQuickChangeSet" }
-            Parameter { name: "reset"; type: "bool" }
-        }
-        Signal {
-            name: "createdItem"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "initItem"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "destroyingItem"
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-    }
-    Component {
         name: "QQuickWorkerScript"
         prototype: "QObject"
         exports: ["QtQuick/WorkerScript 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "source"; type: "QUrl" }
         Signal {
             name: "message"
@@ -3701,6 +3940,7 @@ Module {
         name: "QRegExpValidator"
         prototype: "QValidator"
         exports: ["QtQuick/RegExpValidator 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "regExp"; type: "QRegExp" }
         Signal {
             name: "regExpChanged"
@@ -3866,9 +4106,11 @@ Module {
                 "SplashScreen": 15,
                 "Desktop": 17,
                 "SubWindow": 18,
+                "ForeignWindow": 33,
                 "WindowType_Mask": 255,
                 "MSWindowsFixedSizeDialogHint": 256,
                 "MSWindowsOwnDC": 512,
+                "BypassWindowManagerHint": 1024,
                 "X11BypassWindowManagerHint": 1024,
                 "FramelessWindowHint": 2048,
                 "WindowTitleHint": 4096,
@@ -3907,9 +4149,11 @@ Module {
                 "SplashScreen": 15,
                 "Desktop": 17,
                 "SubWindow": 18,
+                "ForeignWindow": 33,
                 "WindowType_Mask": 255,
                 "MSWindowsFixedSizeDialogHint": 256,
                 "MSWindowsOwnDC": 512,
+                "BypassWindowManagerHint": 1024,
                 "X11BypassWindowManagerHint": 1024,
                 "FramelessWindowHint": 2048,
                 "WindowTitleHint": 4096,
@@ -4105,7 +4349,8 @@ Module {
                 "AA_X11InitThreads": 10,
                 "AA_SynthesizeTouchForUnhandledMouseEvents": 11,
                 "AA_SynthesizeMouseForUnhandledTouchEvents": 12,
-                "AA_AttributeCount": 13
+                "AA_UseHighDpiPixmaps": 13,
+                "AA_AttributeCount": 14
             }
         }
         Enum {
@@ -4790,6 +5035,15 @@ Module {
             }
         }
         Enum {
+            name: "Edge"
+            values: {
+                "TopEdge": 1,
+                "LeftEdge": 2,
+                "RightEdge": 4,
+                "BottomEdge": 8
+            }
+        }
+        Enum {
             name: "ConnectionType"
             values: {
                 "AutoConnection": 0,
@@ -4916,6 +5170,7 @@ Module {
                 "ImhDate": 128,
                 "ImhTime": 256,
                 "ImhPreferLatin": 512,
+                "ImhMultiLine": 1024,
                 "ImhDigitsOnly": 65536,
                 "ImhFormattedNumbersOnly": 131072,
                 "ImhUppercaseOnly": 262144,
@@ -4941,6 +5196,7 @@ Module {
                 "ImhDate": 128,
                 "ImhTime": 256,
                 "ImhPreferLatin": 512,
+                "ImhMultiLine": 1024,
                 "ImhDigitsOnly": 65536,
                 "ImhFormattedNumbersOnly": 131072,
                 "ImhUppercaseOnly": 262144,
@@ -5010,7 +5266,8 @@ Module {
                 "ItemIsDropEnabled": 8,
                 "ItemIsUserCheckable": 16,
                 "ItemIsEnabled": 32,
-                "ItemIsTristate": 64
+                "ItemIsTristate": 64,
+                "ItemNeverHasChildren": 128
             }
         }
         Enum {
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index fbfad28209..0bec4cddf2 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -143,7 +143,7 @@ Item {
             if ("mapFromItem" in o && "mapToItem" in o) {
                 return "declarativeitem";  // @todo improve detection of declarative items
             } else if ("x" in o && "y" in o && "z" in o) {
-                return "vector3d"; // Qt3D vector
+                return "vector3d"; // Qt 3D vector
             }
             return "object";
         } else if (o instanceof Function) {
@@ -291,6 +291,11 @@ Item {
     }
 
     function tryCompare(obj, prop, value, timeout) {
+        if (arguments.length == 2) {
+            qtest_results.fail("A value is required for tryCompare",
+                        util.callerFile(), util.callerLine())
+            throw new Error("QtQuickTest::fail")
+        }
         if (!timeout)
             timeout = 5000
         if (!qtest_compareInternal(obj[prop], value))
@@ -682,6 +687,9 @@ Item {
                 qtest_runFunction(prop, null, isBenchmark)
             }
             qtest_results.finishTestFunction()
+            // wait(0) will call processEvents() so objects marked for deletion
+            // in the test function will be deleted.
+            wait(0)
             qtest_results.skipped = false
         }
 
diff --git a/src/imports/testlib/plugins.qmltypes b/src/imports/testlib/plugins.qmltypes
index 5ad3f891f9..2865812eb2 100644
--- a/src/imports/testlib/plugins.qmltypes
+++ b/src/imports/testlib/plugins.qmltypes
@@ -3,13 +3,14 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command 'qmlplugindump QtTest 1.0'.
+// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtTest 1.0'.
 
 Module {
     Component {
         name: "QuickTestEvent"
         prototype: "QObject"
-        exports: ["TestEvent 1.0"]
+        exports: ["QtTest/TestEvent 1.0"]
+        exportMetaObjectRevisions: [0]
         Method {
             name: "keyPress"
             type: "bool"
@@ -32,6 +33,27 @@ Module {
             Parameter { name: "delay"; type: "int" }
         }
         Method {
+            name: "keyPressChar"
+            type: "bool"
+            Parameter { name: "character"; type: "string" }
+            Parameter { name: "modifiers"; type: "int" }
+            Parameter { name: "delay"; type: "int" }
+        }
+        Method {
+            name: "keyReleaseChar"
+            type: "bool"
+            Parameter { name: "character"; type: "string" }
+            Parameter { name: "modifiers"; type: "int" }
+            Parameter { name: "delay"; type: "int" }
+        }
+        Method {
+            name: "keyClickChar"
+            type: "bool"
+            Parameter { name: "character"; type: "string" }
+            Parameter { name: "modifiers"; type: "int" }
+            Parameter { name: "delay"; type: "int" }
+        }
+        Method {
             name: "mousePress"
             type: "bool"
             Parameter { name: "item"; type: "QObject"; isPointer: true }
@@ -96,7 +118,8 @@ Module {
     Component {
         name: "QuickTestResult"
         prototype: "QObject"
-        exports: ["TestResult 1.0"]
+        exports: ["QtTest/TestResult 1.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "RunMode"
             values: {
@@ -230,7 +253,8 @@ Module {
     Component {
         name: "QuickTestUtil"
         prototype: "QObject"
-        exports: ["TestUtil 1.0"]
+        exports: ["QtTest/TestUtil 1.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "printAvailableFunctions"; type: "bool"; isReadonly: true }
         Property { name: "dragThreshold"; type: "int"; isReadonly: true }
         Method {
diff --git a/src/imports/widgets/plugins.qmltypes b/src/imports/widgets/plugins.qmltypes
index f9fe1f722c..583a36a357 100644
--- a/src/imports/widgets/plugins.qmltypes
+++ b/src/imports/widgets/plugins.qmltypes
@@ -3,39 +3,72 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command 'qmlplugindump QtQuick.PrivateWidgets 1.0'.
+// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtQuick.PrivateWidgets 1.0'.
 
 Module {
     Component {
-        name: "QQuickAbstractFileDialog"
+        name: "QQuickAbstractColorDialog"
+        prototype: "QQuickAbstractDialog"
+        Property { name: "showAlphaChannel"; type: "bool" }
+        Property { name: "color"; type: "QColor" }
+        Signal { name: "selectionAccepted" }
+        Method {
+            name: "setVisible"
+            Parameter { name: "v"; type: "bool" }
+        }
+        Method {
+            name: "setModality"
+            Parameter { name: "m"; type: "Qt::WindowModality" }
+        }
+        Method {
+            name: "setTitle"
+            Parameter { name: "t"; type: "string" }
+        }
+        Method {
+            name: "setColor"
+            Parameter { name: "arg"; type: "QColor" }
+        }
+        Method {
+            name: "setShowAlphaChannel"
+            Parameter { name: "arg"; type: "bool" }
+        }
+    }
+    Component {
+        name: "QQuickAbstractDialog"
         prototype: "QObject"
         Property { name: "visible"; type: "bool" }
         Property { name: "modality"; type: "Qt::WindowModality" }
         Property { name: "title"; type: "string" }
+        Property { name: "x"; type: "int" }
+        Property { name: "y"; type: "int" }
+        Property { name: "width"; type: "int" }
+        Property { name: "height"; type: "int" }
+        Signal { name: "visibilityChanged" }
+        Signal { name: "geometryChanged" }
+        Signal { name: "accepted" }
+        Signal { name: "rejected" }
+        Method { name: "open" }
+        Method { name: "close" }
+    }
+    Component {
+        name: "QQuickAbstractFileDialog"
+        prototype: "QQuickAbstractDialog"
         Property { name: "selectExisting"; type: "bool" }
         Property { name: "selectMultiple"; type: "bool" }
         Property { name: "selectFolder"; type: "bool" }
         Property { name: "folder"; type: "string" }
         Property { name: "nameFilters"; type: "QStringList" }
         Property { name: "selectedNameFilter"; type: "string" }
-        Property { name: "filePath"; type: "string"; isReadonly: true }
-        Property { name: "filePaths"; type: "QStringList"; isReadonly: true }
-        Signal { name: "visibilityChanged" }
+        Property { name: "fileUrl"; type: "QUrl"; isReadonly: true }
+        Property { name: "fileUrls"; type: "QList<QUrl>"; isReadonly: true }
         Signal { name: "filterSelected" }
         Signal { name: "fileModeChanged" }
-        Signal { name: "accepted" }
-        Signal { name: "rejected" }
-        Method { name: "open" }
-        Method { name: "close" }
+        Signal { name: "selectionAccepted" }
         Method {
             name: "setVisible"
             Parameter { name: "v"; type: "bool" }
         }
         Method {
-            name: "setModality"
-            Parameter { name: "m"; type: "Qt::WindowModality" }
-        }
-        Method {
             name: "setTitle"
             Parameter { name: "t"; type: "string" }
         }
@@ -65,8 +98,15 @@ Module {
         }
     }
     Component {
+        name: "QQuickQColorDialog"
+        prototype: "QQuickAbstractColorDialog"
+        exports: ["QtQuick.PrivateWidgets/QtColorDialog 1.0"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "QQuickQFileDialog"
         prototype: "QQuickAbstractFileDialog"
-        exports: ["QtFileDialog 1.0"]
+        exports: ["QtQuick.PrivateWidgets/QtFileDialog 1.0"]
+        exportMetaObjectRevisions: [0]
     }
 }
diff --git a/src/imports/widgets/widgetsplugin.cpp b/src/imports/widgets/widgetsplugin.cpp
index a29c9b3609..be9d59f346 100644
--- a/src/imports/widgets/widgetsplugin.cpp
+++ b/src/imports/widgets/widgetsplugin.cpp
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
     \brief Provides QML types for certain QWidgets
     \internal
 
-    This QML module contains types which should not be depended upon in QtQuick
+    This QML module contains types which should not be depended upon in Qt Quick
     applications, but are available if the Widgets module is linked. It is
     recommended to load components from this module conditionally, if at all,
     and to provide fallback implementations in case they fail to load.
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes
index ff29466670..59e69114e1 100644
--- a/src/imports/window/plugins.qmltypes
+++ b/src/imports/window/plugins.qmltypes
@@ -3,7 +3,7 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command 'qmlplugindump QtQuick.Window 2.0'.
+// This file was auto-generated with the command 'qmlplugindump QtQuick.Window 2.1 -notrelocatable'.
 
 Module {
     Component {
@@ -22,16 +22,24 @@ Module {
     Component {
         name: "QQuickScreen"
         prototype: "QObject"
-        exports: ["Screen 2.0"]
+        exports: ["QtQuick.Window/Screen 2.0"]
+        exportMetaObjectRevisions: [0]
         attachedType: "QQuickScreenAttached"
     }
     Component {
         name: "QQuickScreenAttached"
         prototype: "QObject"
+        Property { name: "name"; revision: 1; type: "string"; isReadonly: true }
         Property { name: "width"; type: "int"; isReadonly: true }
         Property { name: "height"; type: "int"; isReadonly: true }
+        Property { name: "desktopAvailableWidth"; revision: 1; type: "int"; isReadonly: true }
+        Property { name: "desktopAvailableHeight"; revision: 1; type: "int"; isReadonly: true }
+        Property { name: "logicalPixelDensity"; revision: 1; type: "double"; isReadonly: true }
         Property { name: "primaryOrientation"; type: "Qt::ScreenOrientation"; isReadonly: true }
         Property { name: "orientation"; type: "Qt::ScreenOrientation"; isReadonly: true }
+        Signal { name: "nameChanged"; revision: 1 }
+        Signal { name: "desktopGeometryChanged"; revision: 1 }
+        Signal { name: "logicalPixelDensityChanged"; revision: 1 }
         Method {
             name: "angleBetween"
             type: "int"
@@ -43,10 +51,18 @@ Module {
         name: "QQuickWindow"
         defaultProperty: "data"
         prototype: "QWindow"
-        exports: ["Window 2.0"]
+        exports: ["QtQuick.Window/Window 2.0", "QtQuick.Window/Window 2.1"]
+        exportMetaObjectRevisions: [0, 1]
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "color"; type: "QColor" }
         Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+        Property {
+            name: "activeFocusItem"
+            revision: 1
+            type: "QQuickItem"
+            isReadonly: true
+            isPointer: true
+        }
         Signal { name: "frameSwapped" }
         Signal { name: "sceneGraphInitialized" }
         Signal { name: "sceneGraphInvalidated" }
@@ -54,15 +70,32 @@ Module {
         Signal { name: "beforeRendering" }
         Signal { name: "afterRendering" }
         Signal {
+            name: "closing"
+            revision: 1
+            Parameter { name: "close"; type: "QQuickCloseEvent"; isPointer: true }
+        }
+        Signal {
             name: "colorChanged"
             Parameter { type: "QColor" }
         }
+        Signal { name: "activeFocusItemChanged"; revision: 1 }
         Method { name: "update" }
         Method { name: "releaseResources" }
     }
     Component {
         name: "QWindow"
         prototype: "QObject"
+        Enum {
+            name: "Visibility"
+            values: {
+                "Hidden": 0,
+                "AutomaticVisibility": 1,
+                "Windowed": 2,
+                "Minimized": 3,
+                "Maximized": 4,
+                "FullScreen": 5
+            }
+        }
         Property { name: "title"; type: "string" }
         Property { name: "modality"; type: "Qt::WindowModality" }
         Property { name: "flags"; type: "Qt::WindowFlags" }
@@ -70,20 +103,15 @@ Module {
         Property { name: "y"; type: "int" }
         Property { name: "width"; type: "int" }
         Property { name: "height"; type: "int" }
-        Property { name: "minimumWidth"; type: "int" }
-        Property { name: "minimumHeight"; type: "int" }
-        Property { name: "maximumWidth"; type: "int" }
-        Property { name: "maximumHeight"; type: "int" }
+        Property { name: "minimumWidth"; revision: 1; type: "int" }
+        Property { name: "minimumHeight"; revision: 1; type: "int" }
+        Property { name: "maximumWidth"; revision: 1; type: "int" }
+        Property { name: "maximumHeight"; revision: 1; type: "int" }
         Property { name: "visible"; type: "bool" }
-        Property { name: "contentOrientation"; type: "Qt::ScreenOrientation" }
-        Property { name: "windowTitle"; type: "string" }
-        Property { name: "windowFilePath"; type: "string" }
-        Property { name: "windowIcon"; type: "QIcon" }
-        Property { name: "windowModality"; type: "Qt::WindowModality" }
-        Signal {
-            name: "windowModalityChanged"
-            Parameter { name: "windowModality"; type: "Qt::WindowModality" }
-        }
+        Property { name: "active"; revision: 1; type: "bool"; isReadonly: true }
+        Property { name: "visibility"; revision: 1; type: "Visibility" }
+        Property { name: "contentOrientation"; revision: 1; type: "Qt::ScreenOrientation" }
+        Property { name: "opacity"; revision: 1; type: "double" }
         Signal {
             name: "screenChanged"
             Parameter { name: "screen"; type: "QScreen"; isPointer: true }
@@ -114,18 +142,22 @@ Module {
         }
         Signal {
             name: "minimumWidthChanged"
+            revision: 1
             Parameter { name: "arg"; type: "int" }
         }
         Signal {
             name: "minimumHeightChanged"
+            revision: 1
             Parameter { name: "arg"; type: "int" }
         }
         Signal {
             name: "maximumWidthChanged"
+            revision: 1
             Parameter { name: "arg"; type: "int" }
         }
         Signal {
             name: "maximumHeightChanged"
+            revision: 1
             Parameter { name: "arg"; type: "int" }
         }
         Signal {
@@ -133,13 +165,26 @@ Module {
             Parameter { name: "arg"; type: "bool" }
         }
         Signal {
+            name: "visibilityChanged"
+            revision: 1
+            Parameter { name: "visibility"; type: "QWindow::Visibility" }
+        }
+        Signal { name: "activeChanged"; revision: 1 }
+        Signal {
             name: "contentOrientationChanged"
+            revision: 1
             Parameter { name: "orientation"; type: "Qt::ScreenOrientation" }
         }
         Signal {
             name: "focusObjectChanged"
             Parameter { name: "object"; type: "QObject"; isPointer: true }
         }
+        Signal {
+            name: "opacityChanged"
+            revision: 1
+            Parameter { name: "opacity"; type: "double" }
+        }
+        Method { name: "requestActivate"; revision: 1 }
         Method {
             name: "setVisible"
             Parameter { name: "visible"; type: "bool" }
@@ -175,19 +220,27 @@ Module {
         }
         Method {
             name: "setMinimumWidth"
+            revision: 1
             Parameter { name: "w"; type: "int" }
         }
         Method {
             name: "setMinimumHeight"
+            revision: 1
             Parameter { name: "h"; type: "int" }
         }
         Method {
             name: "setMaximumWidth"
+            revision: 1
             Parameter { name: "w"; type: "int" }
         }
         Method {
             name: "setMaximumHeight"
+            revision: 1
             Parameter { name: "h"; type: "int" }
         }
+        Method {
+            name: "alert"
+            Parameter { name: "msec"; type: "int" }
+        }
     }
 }
diff --git a/src/imports/xmllistmodel/plugins.qmltypes b/src/imports/xmllistmodel/plugins.qmltypes
index c71899776f..d951d07719 100644
--- a/src/imports/xmllistmodel/plugins.qmltypes
+++ b/src/imports/xmllistmodel/plugins.qmltypes
@@ -3,14 +3,15 @@ import QtQuick.tooling 1.1
 // This file describes the plugin-supplied types contained in the library.
 // It is used for QML tooling purposes only.
 //
-// This file was auto-generated with the command 'qmlplugindump QtQuick.XmlListModel 2.0'.
+// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtQuick.XmlListModel 2.0'.
 
 Module {
     Component {
         name: "QQuickXmlListModel"
         defaultProperty: "roles"
         prototype: "QAbstractListModel"
-        exports: ["XmlListModel 2.0"]
+        exports: ["QtQuick.XmlListModel/XmlListModel 2.0"]
+        exportMetaObjectRevisions: [0]
         Enum {
             name: "Status"
             values: {
@@ -47,7 +48,8 @@ Module {
     Component {
         name: "QQuickXmlListModelRole"
         prototype: "QObject"
-        exports: ["XmlRole 2.0"]
+        exports: ["QtQuick.XmlListModel/XmlRole 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "name"; type: "string" }
         Property { name: "query"; type: "string" }
         Property { name: "isKey"; type: "bool" }
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index e814eda04b..f3f78c8eae 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -95,7 +95,7 @@ typedef QPair<int, int> QQuickXmlListRange;
     \brief For specifying a role to an XmlListModel
     \ingroup qtquick-models
 
-    \sa {QtQml}
+    \sa {Qt QML}
 */
 
 /*!
author	Simon Hausmann <simon.hausmann@digia.com>	2013-06-24 11:26:22 +0200
committer	Simon Hausmann <simon.hausmann@digia.com>	2013-06-24 11:48:46 +0200
commit	1a9759855639b9e2b3cdc0687d3381dcbf6c9815 (patch)
tree	b2da51f6eddddb83c2d97cdcfac24d38d2e67a4e /src/imports
parent	8217ec1b888f3ff93f004801b018c5f85362c484 (diff)
parent	e1fc2793aef53b84a3f1e19b6d6bdf1141340074 (diff)