qtdeclarative: update .qmltypes, and use -notrelocatable option

this should fix some bugs in the code support due to incorrec/outdated
meta info

Change-Id: I90925daa5376ebdfb9a6f9d73103893065c15d64
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

diff --git a/src/imports/dialogs/plugins.qmltypes b/src/imports/dialogs/plugins.qmltypes
index faf68de..80eb8bd 100644 (file)
--- 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/folderlistmodel/plugins.qmltypes b/src/imports/folderlistmodel/plugins.qmltypes
index fabeb9e..20914f4 100644 (file)
--- 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/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes
index 75b83c7..ec60a14 100644 (file)
--- 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: "QQmlV8Function"; isPointer: true }

diff --git a/src/imports/particles/plugins.qmltypes b/src/imports/particles/plugins.qmltypes
index 069b561..ee948ad 100644 (file)
--- 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/testlib/plugins.qmltypes b/src/imports/testlib/plugins.qmltypes
index 5d7c161..7530e49 100644 (file)
--- 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 f9fe1f7..583a36a 100644 (file)
--- 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/xmllistmodel/plugins.qmltypes b/src/imports/xmllistmodel/plugins.qmltypes
index 281a2ad..2a431eb 100644 (file)
--- 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" }