Update .qmltypes files for 5.2

Task-number: QTBUG-34601
Change-Id: Icf5bdc2ea66b9a13186de957d5ae9c8701b481c7
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

diff --git a/src/imports/dialogs/plugins.qmltypes b/src/imports/dialogs/plugins.qmltypes
index c52d355..d5db4b9 100644 (file)
--- a/src/imports/dialogs/plugins.qmltypes
+++ b/src/imports/dialogs/plugins.qmltypes
@@ -3,7 +3,8 @@ 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 -notrelocatable QtQuick.Dialogs 1.0'.
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable -omit-prefix=__ QtQuick.Dialogs 1.1'
 
 Module {
     Component {
@@ -124,15 +125,530 @@ Module {
         }
     }
     Component {
-        name: "QQuickPlatformColorDialog"
+        name: "QQuickAbstractFontDialog"
+        prototype: "QQuickAbstractDialog"
+        Property { name: "scalableFonts"; type: "bool" }
+        Property { name: "nonScalableFonts"; type: "bool" }
+        Property { name: "monospacedFonts"; type: "bool" }
+        Property { name: "proportionalFonts"; type: "bool" }
+        Property { name: "font"; type: "QFont" }
+        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: "setFont"
+            Parameter { name: "arg"; type: "QFont" }
+        }
+        Method {
+            name: "setScalableFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Method {
+            name: "setNonScalableFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Method {
+            name: "setMonospacedFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Method {
+            name: "setProportionalFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+    }
+    Component {
+        name: "QQuickAbstractMessageDialog"
+        prototype: "QQuickAbstractDialog"
+        Enum {
+            name: "Icon"
+            values: {
+                "NoIcon": 0,
+                "Information": 1,
+                "Warning": 2,
+                "Critical": 3,
+                "Question": 4
+            }
+        }
+        Enum {
+            name: "StandardButton"
+            values: {
+                "NoButton": 0,
+                "Ok": 1024,
+                "Save": 2048,
+                "SaveAll": 4096,
+                "Open": 8192,
+                "Yes": 16384,
+                "YesToAll": 32768,
+                "No": 65536,
+                "NoToAll": 131072,
+                "Abort": 262144,
+                "Retry": 524288,
+                "Ignore": 1048576,
+                "Close": 2097152,
+                "Cancel": 4194304,
+                "Discard": 8388608,
+                "Help": 16777216,
+                "Apply": 33554432,
+                "Reset": 67108864,
+                "RestoreDefaults": 134217728
+            }
+        }
+        Enum {
+            name: "StandardButtons"
+            values: {
+                "NoButton": 0,
+                "Ok": 1024,
+                "Save": 2048,
+                "SaveAll": 4096,
+                "Open": 8192,
+                "Yes": 16384,
+                "YesToAll": 32768,
+                "No": 65536,
+                "NoToAll": 131072,
+                "Abort": 262144,
+                "Retry": 524288,
+                "Ignore": 1048576,
+                "Close": 2097152,
+                "Cancel": 4194304,
+                "Discard": 8388608,
+                "Help": 16777216,
+                "Apply": 33554432,
+                "Reset": 67108864,
+                "RestoreDefaults": 134217728
+            }
+        }
+        Property { name: "text"; type: "string" }
+        Property { name: "informativeText"; type: "string" }
+        Property { name: "detailedText"; type: "string" }
+        Property { name: "icon"; type: "Icon" }
+        Property { name: "standardIconSource"; type: "QUrl"; isReadonly: true }
+        Property { name: "standardButtons"; type: "StandardButtons" }
+        Property { name: "clickedButton"; type: "StandardButton"; isReadonly: true }
+        Signal { name: "buttonClicked" }
+        Signal { name: "discard" }
+        Signal { name: "help" }
+        Signal { name: "yes" }
+        Signal { name: "no" }
+        Signal { name: "apply" }
+        Signal { name: "reset" }
+        Method {
+            name: "setVisible"
+            Parameter { name: "v"; type: "bool" }
+        }
+        Method {
+            name: "setTitle"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setText"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setInformativeText"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setDetailedText"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setIcon"
+            Parameter { name: "icon"; type: "Icon" }
+        }
+        Method {
+            name: "setStandardButtons"
+            Parameter { name: "buttons"; type: "StandardButtons" }
+        }
+        Method {
+            name: "click"
+            Parameter { name: "button"; type: "QMessageDialogOptions::StandardButton" }
+            Parameter { type: "QMessageDialogOptions::ButtonRole" }
+        }
+        Method {
+            name: "click"
+            Parameter { name: "button"; type: "QQuickAbstractMessageDialog::StandardButton" }
+        }
+    }
+    Component {
+        name: "QQuickColorDialog"
+        defaultProperty: "implementation"
         prototype: "QQuickAbstractColorDialog"
-        exports: ["QtQuick.Dialogs/ColorDialog 1.0"]
+        exports: ["QtQuick.Dialogs/AbstractColorDialog 1.0"]
         exportMetaObjectRevisions: [0]
+        Property { name: "implementation"; type: "QObject"; isPointer: true }
     }
     Component {
-        name: "QQuickPlatformFileDialog"
+        name: "QQuickFileDialog"
+        defaultProperty: "implementation"
         prototype: "QQuickAbstractFileDialog"
+        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: "QUrl" }
+        }
+    }
+    Component {
+        name: "QQuickFontDialog"
+        defaultProperty: "implementation"
+        prototype: "QQuickAbstractFontDialog"
+        exports: ["QtQuick.Dialogs/AbstractFontDialog 1.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "implementation"; type: "QObject"; isPointer: true }
+    }
+    Component {
+        name: "QQuickMessageDialog"
+        defaultProperty: "implementation"
+        prototype: "QQuickAbstractMessageDialog"
+        exports: ["QtQuick.Dialogs/AbstractMessageDialog 1.1"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "implementation"; type: "QObject"; isPointer: true }
+    }
+    Component {
+        name: "QQuickStandardButton"
+        exports: ["QtQuick.Dialogs/StandardButton 1.1"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "QQuickStandardIcon"
+        exports: ["QtQuick.Dialogs/StandardIcon 1.1"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        prototype: "QObject"
+        name: "QtQuick.Dialogs/ColorDialog"
+        exports: ["QtQuick.Dialogs/ColorDialog 1.0"]
+        exportMetaObjectRevisions: [0]
+        defaultProperty: "implementation"
+        Property { name: "showAlphaChannel"; type: "bool" }
+        Property { name: "color"; type: "QColor" }
+        Property { name: "currentColor"; type: "QColor" }
+        Property { name: "currentHue"; type: "double"; isReadonly: true }
+        Property { name: "currentSaturation"; type: "double"; isReadonly: true }
+        Property { name: "currentLightness"; type: "double"; isReadonly: true }
+        Property { name: "currentAlpha"; type: "double"; isReadonly: true }
+        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: "setCurrentColor"
+            Parameter { name: "currentColor"; type: "QColor" }
+        }
+        Method {
+            name: "setShowAlphaChannel"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Property { name: "visible"; type: "bool" }
+        Property { name: "modality"; type: "Qt::WindowModality" }
+        Property { name: "title"; type: "string" }
+        Property { name: "isWindow"; type: "bool"; isReadonly: true }
+        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" }
+        Method {
+            name: "setX"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setY"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setWidth"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setHeight"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Property { name: "implementation"; type: "QObject"; isPointer: true }
+    }
+    Component {
+        prototype: "QObject"
+        name: "QtQuick.Dialogs/FileDialog"
         exports: ["QtQuick.Dialogs/FileDialog 1.0"]
         exportMetaObjectRevisions: [0]
+        defaultProperty: "implementation"
+        Property { name: "visible"; type: "bool" }
+        Property { name: "modality"; type: "Qt::WindowModality" }
+        Property { name: "title"; type: "string" }
+        Property { name: "isWindow"; type: "bool"; isReadonly: true }
+        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" }
+        Method {
+            name: "setX"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setY"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setWidth"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setHeight"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Property { name: "selectExisting"; type: "bool" }
+        Property { name: "selectMultiple"; type: "bool" }
+        Property { name: "selectFolder"; type: "bool" }
+        Property { name: "folder"; type: "QUrl" }
+        Property { name: "nameFilters"; type: "QStringList" }
+        Property { name: "selectedNameFilter"; type: "string" }
+        Property { name: "fileUrl"; type: "QUrl"; isReadonly: true }
+        Property { name: "fileUrls"; type: "QList<QUrl>"; isReadonly: true }
+        Signal { name: "filterSelected" }
+        Signal { name: "fileModeChanged" }
+        Signal { name: "selectionAccepted" }
+        Method {
+            name: "setVisible"
+            Parameter { name: "v"; type: "bool" }
+        }
+        Method {
+            name: "setTitle"
+            Parameter { name: "t"; type: "string" }
+        }
+        Method {
+            name: "setSelectExisting"
+            Parameter { name: "s"; type: "bool" }
+        }
+        Method {
+            name: "setSelectMultiple"
+            Parameter { name: "s"; type: "bool" }
+        }
+        Method {
+            name: "setSelectFolder"
+            Parameter { name: "s"; type: "bool" }
+        }
+        Method {
+            name: "setFolder"
+            Parameter { name: "f"; type: "QUrl" }
+        }
+        Method {
+            name: "setNameFilters"
+            Parameter { name: "f"; type: "QStringList" }
+        }
+        Method {
+            name: "selectNameFilter"
+            Parameter { name: "f"; type: "string" }
+        }
+        Property { name: "implementation"; type: "QObject"; isPointer: true }
+        Method { name: "clearSelection" }
+        Method {
+            name: "addSelection"
+            type: "bool"
+            Parameter { name: "path"; type: "QUrl" }
+        }
+    }
+    Component {
+        prototype: "QObject"
+        name: "QtQuick.Dialogs/FontDialog"
+        exports: ["QtQuick.Dialogs/FontDialog 1.1"]
+        exportMetaObjectRevisions: [1]
+        defaultProperty: "implementation"
+        Property { name: "font"; type: "QFont" }
+        Property { name: "visible"; type: "bool" }
+        Property { name: "modality"; type: "Qt::WindowModality" }
+        Property { name: "title"; type: "string" }
+        Property { name: "isWindow"; type: "bool"; isReadonly: true }
+        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" }
+        Method {
+            name: "setX"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setY"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setWidth"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setHeight"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Property { name: "scalableFonts"; type: "bool" }
+        Property { name: "nonScalableFonts"; type: "bool" }
+        Property { name: "monospacedFonts"; type: "bool" }
+        Property { name: "proportionalFonts"; type: "bool" }
+        Property { name: "font"; type: "QFont" }
+        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: "setFont"
+            Parameter { name: "arg"; type: "QFont" }
+        }
+        Method {
+            name: "setScalableFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Method {
+            name: "setNonScalableFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Method {
+            name: "setMonospacedFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Method {
+            name: "setProportionalFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Property { name: "implementation"; type: "QObject"; isPointer: true }
+    }
+    Component {
+        prototype: "QObject"
+        name: "QtQuick.Dialogs/MessageDialog"
+        exports: ["QtQuick.Dialogs/MessageDialog 1.1"]
+        exportMetaObjectRevisions: [1]
+        defaultProperty: "implementation"
+        Method { name: "calculateImplicitWidth"; type: "QVariant" }
+        Property { name: "visible"; type: "bool" }
+        Property { name: "modality"; type: "Qt::WindowModality" }
+        Property { name: "title"; type: "string" }
+        Property { name: "isWindow"; type: "bool"; isReadonly: true }
+        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" }
+        Method {
+            name: "setX"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setY"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setWidth"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setHeight"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Property { name: "text"; type: "string" }
+        Property { name: "informativeText"; type: "string" }
+        Property { name: "detailedText"; type: "string" }
+        Property { name: "icon"; type: "Icon" }
+        Property { name: "standardIconSource"; type: "QUrl"; isReadonly: true }
+        Property { name: "standardButtons"; type: "StandardButtons" }
+        Property { name: "clickedButton"; type: "StandardButton"; isReadonly: true }
+        Signal { name: "buttonClicked" }
+        Signal { name: "discard" }
+        Signal { name: "help" }
+        Signal { name: "yes" }
+        Signal { name: "no" }
+        Signal { name: "apply" }
+        Signal { name: "reset" }
+        Method {
+            name: "setVisible"
+            Parameter { name: "v"; type: "bool" }
+        }
+        Method {
+            name: "setTitle"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setText"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setInformativeText"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setDetailedText"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setIcon"
+            Parameter { name: "icon"; type: "Icon" }
+        }
+        Method {
+            name: "setStandardButtons"
+            Parameter { name: "buttons"; type: "StandardButtons" }
+        }
+        Method {
+            name: "click"
+            Parameter { name: "button"; type: "QMessageDialogOptions::StandardButton" }
+            Parameter { type: "QMessageDialogOptions::ButtonRole" }
+        }
+        Method {
+            name: "click"
+            Parameter { name: "button"; type: "QQuickAbstractMessageDialog::StandardButton" }
+        }
+        Property { name: "implementation"; type: "QObject"; isPointer: true }
     }
 }

diff --git a/src/imports/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes
index bcd516c..05bcc87 100644 (file)
--- a/src/imports/localstorage/plugins.qmltypes
+++ b/src/imports/localstorage/plugins.qmltypes
@@ -3,7 +3,8 @@ 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 -notrelocatable QtQuick.LocalStorage 2.0'.
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtQuick.LocalStorage 2.0'
 
 Module {
     Component {

diff --git a/src/imports/particles/plugins.qmltypes b/src/imports/particles/plugins.qmltypes
index 495c072..712d4fd 100644 (file)
--- a/src/imports/particles/plugins.qmltypes
+++ b/src/imports/particles/plugins.qmltypes
@@ -3,7 +3,8 @@ 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 -notrelocatable QtQuick.Particles 2.0'.
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtQuick.Particles 2.0'
 
 Module {
     Component {

diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 02c7d61..cadef10 100644 (file)
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -3,7 +3,8 @@ 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 -notrelocatable -builtins'.
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable -builtins'
 
 Module {
     Component {
@@ -222,6 +223,85 @@ Module {
         }
     }
     Component {
+        name: "QKeySequence"
+        exports: ["QtQuick/StandardKey 2.2"]
+        exportMetaObjectRevisions: [2]
+        Enum {
+            name: "StandardKey"
+            values: {
+                "UnknownKey": 0,
+                "HelpContents": 1,
+                "WhatsThis": 2,
+                "Open": 3,
+                "Close": 4,
+                "Save": 5,
+                "New": 6,
+                "Delete": 7,
+                "Cut": 8,
+                "Copy": 9,
+                "Paste": 10,
+                "Undo": 11,
+                "Redo": 12,
+                "Back": 13,
+                "Forward": 14,
+                "Refresh": 15,
+                "ZoomIn": 16,
+                "ZoomOut": 17,
+                "Print": 18,
+                "AddTab": 19,
+                "NextChild": 20,
+                "PreviousChild": 21,
+                "Find": 22,
+                "FindNext": 23,
+                "FindPrevious": 24,
+                "Replace": 25,
+                "SelectAll": 26,
+                "Bold": 27,
+                "Italic": 28,
+                "Underline": 29,
+                "MoveToNextChar": 30,
+                "MoveToPreviousChar": 31,
+                "MoveToNextWord": 32,
+                "MoveToPreviousWord": 33,
+                "MoveToNextLine": 34,
+                "MoveToPreviousLine": 35,
+                "MoveToNextPage": 36,
+                "MoveToPreviousPage": 37,
+                "MoveToStartOfLine": 38,
+                "MoveToEndOfLine": 39,
+                "MoveToStartOfBlock": 40,
+                "MoveToEndOfBlock": 41,
+                "MoveToStartOfDocument": 42,
+                "MoveToEndOfDocument": 43,
+                "SelectNextChar": 44,
+                "SelectPreviousChar": 45,
+                "SelectNextWord": 46,
+                "SelectPreviousWord": 47,
+                "SelectNextLine": 48,
+                "SelectPreviousLine": 49,
+                "SelectNextPage": 50,
+                "SelectPreviousPage": 51,
+                "SelectStartOfLine": 52,
+                "SelectEndOfLine": 53,
+                "SelectStartOfBlock": 54,
+                "SelectEndOfBlock": 55,
+                "SelectStartOfDocument": 56,
+                "SelectEndOfDocument": 57,
+                "DeleteStartOfWord": 58,
+                "DeleteEndOfWord": 59,
+                "DeleteEndOfLine": 60,
+                "InsertParagraphSeparator": 61,
+                "InsertLineSeparator": 62,
+                "SaveAs": 63,
+                "Preferences": 64,
+                "Quit": 65,
+                "FullScreen": 66,
+                "Deselect": 67,
+                "DeleteCompleteLine": 68
+            }
+        }
+    }
+    Component {
         name: "QObject"
         exports: ["QtQml/QtObject 2.0", "QtQuick/QtObject 2.0"]
         exportMetaObjectRevisions: [0, 0]
@@ -243,6 +323,8 @@ Module {
         Property { name: "arguments"; type: "QStringList"; isReadonly: true }
         Property { name: "name"; type: "string" }
         Property { name: "version"; type: "string" }
+        Property { name: "organization"; type: "string" }
+        Property { name: "domain"; type: "string" }
         Signal { name: "aboutToQuit" }
         Method {
             name: "setName"
@@ -252,6 +334,14 @@ Module {
             name: "setVersion"
             Parameter { name: "arg"; type: "string" }
         }
+        Method {
+            name: "setOrganization"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setDomain"
+            Parameter { name: "arg"; type: "string" }
+        }
     }
     Component {
         name: "QQmlBind"
@@ -378,44 +468,44 @@ Module {
         Signal { name: "defaultIncludeChanged" }
         Signal {
             name: "changed"
-            Parameter { name: "removed"; type: "QQmlV8Handle" }
-            Parameter { name: "inserted"; type: "QQmlV8Handle" }
+            Parameter { name: "removed"; type: "QQmlV4Handle" }
+            Parameter { name: "inserted"; type: "QQmlV4Handle" }
         }
         Method {
             name: "insert"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "create"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "resolve"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "remove"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "addGroups"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "removeGroups"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "setGroups"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "move"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "get"
-            type: "QQmlV8Handle"
+            type: "QQmlV4Handle"
             Parameter { name: "index"; type: "int" }
         }
     }
@@ -550,25 +640,25 @@ Module {
         Method { name: "clear" }
         Method {
             name: "remove"
-            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "append"
-            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "insert"
-            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "get"
-            type: "QQmlV8Handle"
+            type: "QQmlV4Handle"
             Parameter { name: "index"; type: "int" }
         }
         Method {
             name: "set"
             Parameter { name: "index"; type: "int" }
-            Parameter { type: "QQmlV8Handle" }
+            Parameter { type: "QQmlV4Handle" }
         }
         Method {
             name: "setProperty"
@@ -586,8 +676,8 @@ Module {
     }
     Component {
         name: "QQmlLocale"
-        exports: ["QtQuick/Locale 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtQml/Locale 2.2", "QtQuick/Locale 2.0"]
+        exportMetaObjectRevisions: [0, 0]
         Enum {
             name: "MeasurementSystem"
             values: {
@@ -958,6 +1048,37 @@ Module {
         Property { name: "animations"; type: "QQuickAbstractAnimation"; isList: true; isReadonly: true }
     }
     Component {
+        name: "QQuickAnimator"
+        prototype: "QQuickAbstractAnimation"
+        exports: ["QtQuick/Animator 2.2"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "target"; type: "QQuickItem"; isPointer: true }
+        Property { name: "easing"; type: "QEasingCurve" }
+        Property { name: "duration"; type: "int" }
+        Property { name: "to"; type: "double" }
+        Property { name: "from"; type: "double" }
+        Signal {
+            name: "targetItemChanged"
+            Parameter { type: "QQuickItem"; isPointer: true }
+        }
+        Signal {
+            name: "durationChanged"
+            Parameter { name: "duration"; type: "int" }
+        }
+        Signal {
+            name: "easingChanged"
+            Parameter { name: "curve"; type: "QEasingCurve" }
+        }
+        Signal {
+            name: "toChanged"
+            Parameter { name: "to"; type: "double" }
+        }
+        Signal {
+            name: "fromChanged"
+            Parameter { name: "from"; type: "double" }
+        }
+    }
+    Component {
         name: "QQuickApplication"
         prototype: "QQmlApplication"
         exports: ["QtQuick/Application 2.0"]
@@ -965,6 +1086,11 @@ Module {
         Property { name: "active"; type: "bool"; isReadonly: true }
         Property { name: "layoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
         Property { name: "supportsMultipleWindows"; type: "bool"; isReadonly: true }
+        Property { name: "state"; type: "Qt::ApplicationState"; isReadonly: true }
+        Signal {
+            name: "stateChanged"
+            Parameter { name: "state"; type: "Qt::ApplicationState" }
+        }
     }
     Component {
         name: "QQuickBasePositioner"
@@ -1066,15 +1192,15 @@ Module {
         }
         Method {
             name: "getContext"
-            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "requestAnimationFrame"
-            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "cancelRequestAnimationFrame"
-            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
         }
         Method { name: "requestPaint" }
         Method {
@@ -1132,6 +1258,14 @@ Module {
         exportMetaObjectRevisions: [0]
         attachedType: "QQuickDragAttached"
         Enum {
+            name: "DragType"
+            values: {
+                "None": 0,
+                "Automatic": 1,
+                "Internal": 2
+            }
+        }
+        Enum {
             name: "Axis"
             values: {
                 "XAxis": 1,
@@ -1148,6 +1282,7 @@ Module {
         Property { name: "maximumY"; type: "double" }
         Property { name: "active"; type: "bool"; isReadonly: true }
         Property { name: "filterChildren"; type: "bool" }
+        Property { name: "threshold"; type: "double" }
     }
     Component {
         name: "QQuickDragAttached"
@@ -1157,11 +1292,22 @@ Module {
         Property { name: "target"; type: "QObject"; isReadonly: true; isPointer: true }
         Property { name: "hotSpot"; type: "QPointF" }
         Property { name: "keys"; type: "QStringList" }
+        Property { name: "mimeData"; type: "QVariantMap" }
         Property { name: "supportedActions"; type: "Qt::DropActions" }
         Property { name: "proposedAction"; type: "Qt::DropAction" }
+        Property { name: "dragType"; type: "QQuickDrag::DragType" }
+        Signal { name: "dragStarted" }
+        Signal {
+            name: "dragFinished"
+            Parameter { name: "dropAction"; type: "Qt::DropAction" }
+        }
         Method {
             name: "start"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
+        }
+        Method {
+            name: "startDrag"
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method { name: "cancel" }
         Method { name: "drop"; type: "int" }
@@ -1743,11 +1889,11 @@ Module {
         }
         Method {
             name: "mapFromItem"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "mapToItem"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
         Method { name: "forceActiveFocus" }
         Method {
@@ -1756,10 +1902,11 @@ Module {
         }
         Method {
             name: "nextItemInFocusChain"
+            revision: 1
             type: "QQuickItem*"
             Parameter { name: "forward"; type: "bool" }
         }
-        Method { name: "nextItemInFocusChain"; type: "QQuickItem*" }
+        Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
         Method {
             name: "childAt"
             type: "QQuickItem*"
@@ -2195,7 +2342,7 @@ Module {
         Signal { name: "loaded" }
         Method {
             name: "setSource"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
     }
     Component {
@@ -2312,6 +2459,12 @@ Module {
         Property { name: "to"; type: "double" }
     }
     Component {
+        name: "QQuickOpacityAnimator"
+        prototype: "QQuickAnimator"
+        exports: ["QtQuick/OpacityAnimator 2.2"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "QQuickPackage"
         defaultProperty: "data"
         prototype: "QObject"
@@ -2825,6 +2978,26 @@ Module {
         Property { name: "direction"; type: "RotationDirection" }
     }
     Component {
+        name: "QQuickRotationAnimator"
+        prototype: "QQuickAnimator"
+        exports: ["QtQuick/RotationAnimator 2.2"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "RotationDirection"
+            values: {
+                "Numerical": 0,
+                "Shortest": 1,
+                "Clockwise": 2,
+                "Counterclockwise": 3
+            }
+        }
+        Property { name: "direction"; type: "RotationDirection" }
+        Signal {
+            name: "directionChanged"
+            Parameter { name: "dir"; type: "RotationDirection" }
+        }
+    }
+    Component {
         name: "QQuickRow"
         defaultProperty: "data"
         prototype: "QQuickBasePositioner"
@@ -2845,6 +3018,12 @@ Module {
         Signal { name: "scaleChanged" }
     }
     Component {
+        name: "QQuickScaleAnimator"
+        prototype: "QQuickAnimator"
+        exports: ["QtQuick/ScaleAnimator 2.2"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "QQuickScaleGrid"
         prototype: "QObject"
         Property { name: "left"; type: "int" }
@@ -3251,8 +3430,8 @@ Module {
         name: "QQuickText"
         defaultProperty: "data"
         prototype: "QQuickImplicitSizeItem"
-        exports: ["QtQuick/Text 2.0"]
-        exportMetaObjectRevisions: [0]
+        exports: ["QtQuick/Text 2.0", "QtQuick/Text 2.2"]
+        exportMetaObjectRevisions: [0, 2]
         Enum {
             name: "HAlignment"
             values: {
@@ -3356,6 +3535,7 @@ Module {
         Property { name: "minimumPointSize"; type: "int" }
         Property { name: "fontSizeMode"; type: "FontSizeMode" }
         Property { name: "renderType"; type: "RenderType" }
+        Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true }
         Signal {
             name: "textChanged"
             Parameter { name: "text"; type: "string" }
@@ -3365,6 +3545,11 @@ Module {
             Parameter { name: "link"; type: "string" }
         }
         Signal {
+            name: "linkHovered"
+            revision: 2
+            Parameter { name: "link"; type: "string" }
+        }
+        Signal {
             name: "fontChanged"
             Parameter { name: "font"; type: "QFont" }
         }
@@ -3408,8 +3593,12 @@ Module {
         name: "QQuickTextEdit"
         defaultProperty: "data"
         prototype: "QQuickImplicitSizeItem"
-        exports: ["QtQuick/TextEdit 2.0", "QtQuick/TextEdit 2.1"]
-        exportMetaObjectRevisions: [0, 1]
+        exports: [
+            "QtQuick/TextEdit 2.0",
+            "QtQuick/TextEdit 2.1",
+            "QtQuick/TextEdit 2.2"
+        ]
+        exportMetaObjectRevisions: [0, 1, 2]
         Enum {
             name: "HAlignment"
             values: {
@@ -3503,6 +3692,7 @@ Module {
             isReadonly: true
             isPointer: true
         }
+        Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true }
         Signal { name: "contentSizeChanged" }
         Signal {
             name: "colorChanged"
@@ -3569,6 +3759,11 @@ Module {
             name: "linkActivated"
             Parameter { name: "link"; type: "string" }
         }
+        Signal {
+            name: "linkHovered"
+            revision: 2
+            Parameter { name: "link"; type: "string" }
+        }
         Method { name: "selectAll" }
         Method { name: "selectWord" }
         Method {
@@ -3599,6 +3794,11 @@ Module {
             Parameter { name: "end"; type: "int" }
         }
         Method {
+            name: "append"
+            revision: 2
+            Parameter { name: "text"; type: "string" }
+        }
+        Method {
             name: "positionToRectangle"
             type: "QRectF"
             Parameter { type: "int" }
@@ -3812,7 +4012,7 @@ Module {
         }
         Method {
             name: "positionAt"
-            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "positionToRectangle"
@@ -3877,6 +4077,17 @@ Module {
         Property { name: "y"; type: "double" }
     }
     Component {
+        name: "QQuickUniformAnimator"
+        prototype: "QQuickAnimator"
+        exports: ["QtQuick/UniformAnimator 2.2"]
+        exportMetaObjectRevisions: [0]
+        Property { name: "uniform"; type: "string" }
+        Signal {
+            name: "uniformChanged"
+            Parameter { type: "string" }
+        }
+    }
+    Component {
         name: "QQuickVector3dAnimation"
         prototype: "QQuickPropertyAnimation"
         exports: ["QtQuick/Vector3dAnimation 2.0"]
@@ -3933,10 +4144,22 @@ Module {
         }
         Method {
             name: "sendMessage"
-            Parameter { type: "QQmlV8Function"; isPointer: true }
+            Parameter { type: "QQmlV4Function"; isPointer: true }
         }
     }
     Component {
+        name: "QQuickXAnimator"
+        prototype: "QQuickAnimator"
+        exports: ["QtQuick/XAnimator 2.2"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
+        name: "QQuickYAnimator"
+        prototype: "QQuickAnimator"
+        exports: ["QtQuick/YAnimator 2.2"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "QRegExpValidator"
         prototype: "QValidator"
         exports: ["QtQuick/RegExpValidator 2.0"]
@@ -4079,7 +4302,8 @@ Module {
                 "AlignTop": 32,
                 "AlignBottom": 64,
                 "AlignVCenter": 128,
-                "AlignVertical_Mask": 224,
+                "AlignBaseline": 256,
+                "AlignVertical_Mask": 480,
                 "AlignCenter": 132
             }
         }
@@ -4107,6 +4331,7 @@ Module {
                 "Desktop": 17,
                 "SubWindow": 18,
                 "ForeignWindow": 33,
+                "CoverWindow": 65,
                 "WindowType_Mask": 255,
                 "MSWindowsFixedSizeDialogHint": 256,
                 "MSWindowsOwnDC": 512,
@@ -4150,6 +4375,7 @@ Module {
                 "Desktop": 17,
                 "SubWindow": 18,
                 "ForeignWindow": 33,
+                "CoverWindow": 65,
                 "WindowType_Mask": 255,
                 "MSWindowsFixedSizeDialogHint": 256,
                 "MSWindowsOwnDC": 512,
@@ -4199,6 +4425,15 @@ Module {
             }
         }
         Enum {
+            name: "ApplicationState"
+            values: {
+                "ApplicationSuspended": 0,
+                "ApplicationHidden": 1,
+                "ApplicationInactive": 2,
+                "ApplicationActive": 4
+            }
+        }
+        Enum {
             name: "ScreenOrientation"
             values: {
                 "PrimaryOrientation": 0,
@@ -4785,6 +5020,13 @@ Module {
                 "Key_TouchpadToggle": 16777488,
                 "Key_TouchpadOn": 16777489,
                 "Key_TouchpadOff": 16777490,
+                "Key_MicMute": 16777491,
+                "Key_Red": 16777492,
+                "Key_Green": 16777493,
+                "Key_Yellow": 16777494,
+                "Key_Blue": 16777495,
+                "Key_ChannelUp": 16777496,
+                "Key_ChannelDown": 16777497,
                 "Key_MediaLast": 16842751,
                 "Key_Select": 16842752,
                 "Key_Yes": 16842753,
@@ -4987,7 +5229,8 @@ Module {
                 "SystemLocaleShortDate": 4,
                 "SystemLocaleLongDate": 5,
                 "DefaultLocaleShortDate": 6,
-                "DefaultLocaleLongDate": 7
+                "DefaultLocaleLongDate": 7,
+                "RFC2822Date": 8
             }
         }
         Enum {
@@ -4995,7 +5238,8 @@ Module {
             values: {
                 "LocalTime": 0,
                 "UTC": 1,
-                "OffsetFromUTC": 2
+                "OffsetFromUTC": 2,
+                "TimeZone": 3
             }
         }
         Enum {
@@ -5366,6 +5610,14 @@ Module {
                 "VeryCoarseTimer": 2
             }
         }
+        Enum {
+            name: "ScrollPhase"
+            values: {
+                "ScrollBegin": 1,
+                "ScrollUpdate": 2,
+                "ScrollEnd": 3
+            }
+        }
     }
     Component { name: "QEasingCurve"; prototype: "QQmlEasingValueType" }
 }

diff --git a/src/imports/settings/plugins.qmltypes b/src/imports/settings/plugins.qmltypes
index 290c4c5..87503fb 100644 (file)
--- a/src/imports/settings/plugins.qmltypes
+++ b/src/imports/settings/plugins.qmltypes
@@ -3,7 +3,8 @@ 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 -notrelocatable Qt.labs.settings 1.0'.
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable Qt.labs.settings 1.0'
 
 Module {
     Component {

diff --git a/src/imports/testlib/plugins.qmltypes b/src/imports/testlib/plugins.qmltypes
index 2865812..94203df 100644 (file)
--- a/src/imports/testlib/plugins.qmltypes
+++ b/src/imports/testlib/plugins.qmltypes
@@ -3,7 +3,8 @@ 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 -notrelocatable QtTest 1.0'.
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtTest 1.0'
 
 Module {
     Component {
@@ -147,7 +148,7 @@ Module {
         Method { name: "finishTestFunction" }
         Method {
             name: "stringify"
-            Parameter { name: "args"; type: "QQmlV8Function"; isPointer: true }
+            Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
         }
         Method {
             name: "fail"

diff --git a/src/imports/widgets/plugins.qmltypes b/src/imports/widgets/plugins.qmltypes
index 9e73330..a67443c 100644 (file)
--- a/src/imports/widgets/plugins.qmltypes
+++ b/src/imports/widgets/plugins.qmltypes
@@ -3,7 +3,8 @@ 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 -notrelocatable QtQuick.PrivateWidgets 1.0'.
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtQuick.PrivateWidgets 1.1'
 
 Module {
     Component {
@@ -11,6 +12,11 @@ Module {
         prototype: "QQuickAbstractDialog"
         Property { name: "showAlphaChannel"; type: "bool" }
         Property { name: "color"; type: "QColor" }
+        Property { name: "currentColor"; type: "QColor" }
+        Property { name: "currentHue"; type: "double"; isReadonly: true }
+        Property { name: "currentSaturation"; type: "double"; isReadonly: true }
+        Property { name: "currentLightness"; type: "double"; isReadonly: true }
+        Property { name: "currentAlpha"; type: "double"; isReadonly: true }
         Signal { name: "selectionAccepted" }
         Method {
             name: "setVisible"
@@ -29,6 +35,10 @@ Module {
             Parameter { name: "arg"; type: "QColor" }
         }
         Method {
+            name: "setCurrentColor"
+            Parameter { name: "currentColor"; type: "QColor" }
+        }
+        Method {
             name: "setShowAlphaChannel"
             Parameter { name: "arg"; type: "bool" }
         }
@@ -50,6 +60,22 @@ Module {
         Signal { name: "rejected" }
         Method { name: "open" }
         Method { name: "close" }
+        Method {
+            name: "setX"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setY"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setWidth"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Method {
+            name: "setHeight"
+            Parameter { name: "arg"; type: "int" }
+        }
     }
     Component {
         name: "QQuickAbstractFileDialog"
@@ -99,6 +125,163 @@ Module {
         }
     }
     Component {
+        name: "QQuickAbstractFontDialog"
+        prototype: "QQuickAbstractDialog"
+        Property { name: "scalableFonts"; type: "bool" }
+        Property { name: "nonScalableFonts"; type: "bool" }
+        Property { name: "monospacedFonts"; type: "bool" }
+        Property { name: "proportionalFonts"; type: "bool" }
+        Property { name: "font"; type: "QFont" }
+        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: "setFont"
+            Parameter { name: "arg"; type: "QFont" }
+        }
+        Method {
+            name: "setScalableFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Method {
+            name: "setNonScalableFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Method {
+            name: "setMonospacedFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+        Method {
+            name: "setProportionalFonts"
+            Parameter { name: "arg"; type: "bool" }
+        }
+    }
+    Component {
+        name: "QQuickAbstractMessageDialog"
+        prototype: "QQuickAbstractDialog"
+        exports: ["QtQuick.PrivateWidgets/QtMessageDialog 1.1"]
+        exportMetaObjectRevisions: [0]
+        Enum {
+            name: "Icon"
+            values: {
+                "NoIcon": 0,
+                "Information": 1,
+                "Warning": 2,
+                "Critical": 3,
+                "Question": 4
+            }
+        }
+        Enum {
+            name: "StandardButton"
+            values: {
+                "NoButton": 0,
+                "Ok": 1024,
+                "Save": 2048,
+                "SaveAll": 4096,
+                "Open": 8192,
+                "Yes": 16384,
+                "YesToAll": 32768,
+                "No": 65536,
+                "NoToAll": 131072,
+                "Abort": 262144,
+                "Retry": 524288,
+                "Ignore": 1048576,
+                "Close": 2097152,
+                "Cancel": 4194304,
+                "Discard": 8388608,
+                "Help": 16777216,
+                "Apply": 33554432,
+                "Reset": 67108864,
+                "RestoreDefaults": 134217728
+            }
+        }
+        Enum {
+            name: "StandardButtons"
+            values: {
+                "NoButton": 0,
+                "Ok": 1024,
+                "Save": 2048,
+                "SaveAll": 4096,
+                "Open": 8192,
+                "Yes": 16384,
+                "YesToAll": 32768,
+                "No": 65536,
+                "NoToAll": 131072,
+                "Abort": 262144,
+                "Retry": 524288,
+                "Ignore": 1048576,
+                "Close": 2097152,
+                "Cancel": 4194304,
+                "Discard": 8388608,
+                "Help": 16777216,
+                "Apply": 33554432,
+                "Reset": 67108864,
+                "RestoreDefaults": 134217728
+            }
+        }
+        Property { name: "text"; type: "string" }
+        Property { name: "informativeText"; type: "string" }
+        Property { name: "detailedText"; type: "string" }
+        Property { name: "icon"; type: "Icon" }
+        Property { name: "standardIconSource"; type: "QUrl"; isReadonly: true }
+        Property { name: "standardButtons"; type: "StandardButtons" }
+        Property { name: "clickedButton"; type: "StandardButton"; isReadonly: true }
+        Signal { name: "buttonClicked" }
+        Signal { name: "discard" }
+        Signal { name: "help" }
+        Signal { name: "yes" }
+        Signal { name: "no" }
+        Signal { name: "apply" }
+        Signal { name: "reset" }
+        Method {
+            name: "setVisible"
+            Parameter { name: "v"; type: "bool" }
+        }
+        Method {
+            name: "setTitle"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setText"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setInformativeText"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setDetailedText"
+            Parameter { name: "arg"; type: "string" }
+        }
+        Method {
+            name: "setIcon"
+            Parameter { name: "icon"; type: "Icon" }
+        }
+        Method {
+            name: "setStandardButtons"
+            Parameter { name: "buttons"; type: "StandardButtons" }
+        }
+        Method {
+            name: "click"
+            Parameter { name: "button"; type: "QMessageDialogOptions::StandardButton" }
+            Parameter { type: "QMessageDialogOptions::ButtonRole" }
+        }
+        Method {
+            name: "click"
+            Parameter { name: "button"; type: "QQuickAbstractMessageDialog::StandardButton" }
+        }
+    }
+    Component {
         name: "QQuickQColorDialog"
         prototype: "QQuickAbstractColorDialog"
         exports: ["QtQuick.PrivateWidgets/QtColorDialog 1.0"]
@@ -110,4 +293,10 @@ Module {
         exports: ["QtQuick.PrivateWidgets/QtFileDialog 1.0"]
         exportMetaObjectRevisions: [0]
     }
+    Component {
+        name: "QQuickQFontDialog"
+        prototype: "QQuickAbstractFontDialog"
+        exports: ["QtQuick.PrivateWidgets/QtFontDialog 1.1"]
+        exportMetaObjectRevisions: [0]
+    }
 }

diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes
index 59e6911..1e3577a 100644 (file)
--- a/src/imports/window/plugins.qmltypes
+++ b/src/imports/window/plugins.qmltypes
@@ -3,7 +3,8 @@ 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.1 -notrelocatable'.
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtQuick.Window 2.0'
 
 Module {
     Component {
@@ -35,11 +36,13 @@ Module {
         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: "pixelDensity"; revision: 2; 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 }
+        Signal { name: "pixelDensityChanged"; revision: 2 }
         Method {
             name: "angleBetween"
             type: "int"
@@ -51,8 +54,8 @@ Module {
         name: "QQuickWindow"
         defaultProperty: "data"
         prototype: "QWindow"
-        exports: ["QtQuick.Window/Window 2.0", "QtQuick.Window/Window 2.1"]
-        exportMetaObjectRevisions: [0, 1]
+        exports: ["QtQuick.Window/Window 2.0"]
+        exportMetaObjectRevisions: [0]
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "color"; type: "QColor" }
         Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
@@ -83,6 +86,13 @@ Module {
         Method { name: "releaseResources" }
     }
     Component {
+        name: "QQuickWindowQmlImpl"
+        defaultProperty: "data"
+        prototype: "QQuickWindow"
+        exports: ["QtQuick.Window/Window 2.1"]
+        exportMetaObjectRevisions: [0]
+    }
+    Component {
         name: "QWindow"
         prototype: "QObject"
         Enum {
@@ -103,14 +113,14 @@ Module {
         Property { name: "y"; type: "int" }
         Property { name: "width"; type: "int" }
         Property { name: "height"; 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: "minimumWidth"; type: "int" }
+        Property { name: "minimumHeight"; type: "int" }
+        Property { name: "maximumWidth"; type: "int" }
+        Property { name: "maximumHeight"; type: "int" }
         Property { name: "visible"; type: "bool" }
         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: "contentOrientation"; type: "Qt::ScreenOrientation" }
         Property { name: "opacity"; revision: 1; type: "double" }
         Signal {
             name: "screenChanged"
@@ -142,22 +152,18 @@ 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 {
@@ -172,7 +178,6 @@ Module {
         Signal { name: "activeChanged"; revision: 1 }
         Signal {
             name: "contentOrientationChanged"
-            revision: 1
             Parameter { name: "orientation"; type: "Qt::ScreenOrientation" }
         }
         Signal {
@@ -220,26 +225,23 @@ 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"
+            revision: 1
             Parameter { name: "msec"; type: "int" }
         }
     }

diff --git a/src/imports/xmllistmodel/plugins.qmltypes b/src/imports/xmllistmodel/plugins.qmltypes
index d951d07..0978237 100644 (file)
--- a/src/imports/xmllistmodel/plugins.qmltypes
+++ b/src/imports/xmllistmodel/plugins.qmltypes
@@ -3,7 +3,8 @@ 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 -notrelocatable QtQuick.XmlListModel 2.0'.
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.0'
 
 Module {
     Component {