From 6c7ee9d83788f89868011cc6458c2a0073d41292 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 26 Nov 2012 16:52:26 +0100 Subject: Imports: update .qmltypes files Change-Id: I897c1e04cbbb2adf9655cbd277d7d51bcd2a50de Reviewed-by: Thomas Hartmann --- src/imports/qtquick2/plugins.qmltypes | 28 +++++++++++++-- src/imports/window/plugins.qmltypes | 64 +++++++++++++++++++++++++++++------ 2 files changed, 79 insertions(+), 13 deletions(-) (limited to 'src/imports') diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes index 015d2ac139..7e5086c077 100644 --- a/src/imports/qtquick2/plugins.qmltypes +++ b/src/imports/qtquick2/plugins.qmltypes @@ -26,11 +26,21 @@ Module { Parameter { name: "first"; type: "int" } Parameter { name: "last"; type: "int" } } + Signal { + name: "layoutChanged" + Parameter { name: "parents"; type: "QList" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } Signal { name: "layoutChanged" Parameter { name: "parents"; type: "QList" } } Signal { name: "layoutChanged" } + Signal { + name: "layoutAboutToBeChanged" + Parameter { name: "parents"; type: "QList" } + Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" } + } Signal { name: "layoutAboutToBeChanged" Parameter { name: "parents"; type: "QList" } @@ -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 } @@ -418,6 +427,14 @@ Module { Method { name: "stop" } 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" @@ -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 53984614a0..ff29466670 100644 --- 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" @@ -100,6 +112,22 @@ Module { name: "heightChanged" 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" } + } } } -- cgit v1.2.3