Imports: update .qmltypes files

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

diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index 015d2ac..7e5086c 100644 (file)
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -29,11 +29,21 @@ Module {
         Signal {
             name: "layoutChanged"
             Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
+            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
+        }
+        Signal {
+            name: "layoutChanged"
+            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
         }
         Signal { name: "layoutChanged" }
         Signal {
             name: "layoutAboutToBeChanged"
             Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
+            Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
+        }
+        Signal {
+            name: "layoutAboutToBeChanged"
+            Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
         }
         Signal { name: "layoutAboutToBeChanged" }
         Signal {
@@ -164,7 +174,6 @@ Module {
                 "ContextMenu": 1
             }
         }
-        Property { name: "inputItem"; type: "QObject"; isPointer: true }
         Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
         Property { name: "keyboardRectangle"; type: "QRectF"; isReadonly: true }
         Property { name: "visible"; type: "bool"; isReadonly: true }
@@ -419,6 +428,14 @@ Module {
         Method { name: "complete" }
     }
     Component {
+        name: "QQuickAccessibleAttached"
+        prototype: "QObject"
+        exports: ["QtQuick/Accessible 2.0"]
+        Property { name: "role"; type: "QAccessible::Role" }
+        Property { name: "name"; type: "string" }
+        Property { name: "description"; type: "string" }
+    }
+    Component {
         name: "QQuickAnchorAnimation"
         prototype: "QQuickAbstractAnimation"
         exports: ["QtQuick/AnchorAnimation 2.0"]
@@ -669,6 +686,7 @@ Module {
         exports: ["QtQuick/Application 2.0"]
         Property { name: "active"; type: "bool"; isReadonly: true }
         Property { name: "layoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
+        Property { name: "supportsMultipleWindows"; type: "bool"; isReadonly: true }
     }
     Component {
         name: "QQuickBasePositioner"
@@ -3871,7 +3889,9 @@ Module {
                 "MacWindowToolBarButtonHint": 268435456,
                 "BypassGraphicsProxyWidget": 536870912,
                 "WindowOkButtonHint": 524288,
-                "WindowCancelButtonHint": 1048576
+                "WindowCancelButtonHint": 1048576,
+                "NoDropShadowWindowHint": 1073741824,
+                "WindowFullscreenButtonHint": -2147483648
             }
         }
         Enum {
@@ -3910,7 +3930,9 @@ Module {
                 "MacWindowToolBarButtonHint": 268435456,
                 "BypassGraphicsProxyWidget": 536870912,
                 "WindowOkButtonHint": 524288,
-                "WindowCancelButtonHint": 1048576
+                "WindowCancelButtonHint": 1048576,
+                "NoDropShadowWindowHint": 1073741824,
+                "WindowFullscreenButtonHint": -2147483648
             }
         }
         Enum {

diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes
index 5398461..ff29466 100644 (file)
--- a/src/imports/window/plugins.qmltypes
+++ b/src/imports/window/plugins.qmltypes
@@ -63,26 +63,38 @@ Module {
     Component {
         name: "QWindow"
         prototype: "QObject"
-        Property { name: "windowTitle"; type: "string" }
-        Property { name: "windowIcon"; type: "QIcon" }
-        Property { name: "windowModality"; type: "Qt::WindowModality" }
+        Property { name: "title"; type: "string" }
+        Property { name: "modality"; type: "Qt::WindowModality" }
+        Property { name: "flags"; type: "Qt::WindowFlags" }
         Property { name: "x"; type: "int" }
         Property { name: "y"; type: "int" }
         Property { name: "width"; type: "int" }
         Property { name: "height"; type: "int" }
-        Property { name: "pos"; type: "QPoint" }
-        Property { name: "size"; type: "QSize" }
-        Property { name: "geometry"; type: "QRect" }
+        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: "contentOrientation"; type: "Qt::ScreenOrientation" }
-        Property { name: "cursor"; type: "QCursor" }
+        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" }
+        }
         Signal {
             name: "screenChanged"
             Parameter { name: "screen"; type: "QScreen"; isPointer: true }
         }
         Signal {
-            name: "windowModalityChanged"
-            Parameter { name: "windowModality"; type: "Qt::WindowModality" }
+            name: "modalityChanged"
+            Parameter { name: "modality"; type: "Qt::WindowModality" }
+        }
+        Signal {
+            name: "windowStateChanged"
+            Parameter { name: "windowState"; type: "Qt::WindowState" }
         }
         Signal {
             name: "xChanged"
@@ -101,6 +113,22 @@ Module {
             Parameter { name: "arg"; type: "int" }
         }
         Signal {
+            name: "minimumWidthChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "minimumHeightChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "maximumWidthChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
+            name: "maximumHeightChanged"
+            Parameter { name: "arg"; type: "int" }
+        }
+        Signal {
             name: "visibleChanged"
             Parameter { name: "arg"; type: "bool" }
         }
@@ -126,7 +154,7 @@ Module {
         Method { name: "raise" }
         Method { name: "lower" }
         Method {
-            name: "setWindowTitle"
+            name: "setTitle"
             Parameter { type: "string" }
         }
         Method {
@@ -145,5 +173,21 @@ Module {
             name: "setHeight"
             Parameter { name: "arg"; type: "int" }
         }
+        Method {
+            name: "setMinimumWidth"
+            Parameter { name: "w"; type: "int" }
+        }
+        Method {
+            name: "setMinimumHeight"
+            Parameter { name: "h"; type: "int" }
+        }
+        Method {
+            name: "setMaximumWidth"
+            Parameter { name: "w"; type: "int" }
+        }
+        Method {
+            name: "setMaximumHeight"
+            Parameter { name: "h"; type: "int" }
+        }
     }
 }