diff options
author | Alan Alpert <416365416c@gmail.com> | 2013-11-11 00:35:08 -0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-12 18:20:30 +0100 |
commit | 67caa984931259e1d4692cc75f91eef676aa5990 (patch) | |
tree | c3cce51fea53ca48e2c5bd9b2b6ab4ec6d72418f /src/imports/window/plugins.qmltypes | |
parent | 19d64a89a6f8d6b7f40c86a04e4198dd86739de2 (diff) |
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>
Diffstat (limited to 'src/imports/window/plugins.qmltypes')
-rw-r--r-- | src/imports/window/plugins.qmltypes | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes index 59e69114e1..1e3577acda 100644 --- 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" } } } |