aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/window
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2014-12-04 09:50:44 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2014-12-05 05:50:47 +0100
commite8338b8e861c8b94592c8e076c2b375814c0d791 (patch)
treee1bf2b58a6695daddec143b5b155cea5b7f50b47 /src/imports/window
parent2ab6b863f4493acf5256de0027f1e3daa0fdd038 (diff)
Update plugins.qmltypes
Change-Id: I9b6c54b572d4653d609b154000e274b9e64d591f Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports/window')
-rw-r--r--src/imports/window/plugins.qmltypes15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes
index 27c0299c32..fa320886db 100644
--- a/src/imports/window/plugins.qmltypes
+++ b/src/imports/window/plugins.qmltypes
@@ -38,8 +38,10 @@ Module {
Property { name: "desktopAvailableHeight"; type: "int"; isReadonly: true }
Property { name: "logicalPixelDensity"; type: "double"; isReadonly: true }
Property { name: "pixelDensity"; type: "double"; isReadonly: true }
+ Property { name: "devicePixelRatio"; type: "double"; isReadonly: true }
Property { name: "primaryOrientation"; type: "Qt::ScreenOrientation"; isReadonly: true }
Property { name: "orientation"; type: "Qt::ScreenOrientation"; isReadonly: true }
+ Property { name: "orientationUpdateMask"; type: "Qt::ScreenOrientations" }
Signal { name: "desktopGeometryChanged" }
Method {
name: "angleBetween"
@@ -104,11 +106,20 @@ Module {
Method { name: "releaseResources" }
}
Component {
+ name: "QQuickWindowAttached"
+ prototype: "QObject"
+ Property { name: "visibility"; type: "QWindow::Visibility"; isReadonly: true }
+ Property { name: "active"; type: "bool"; isReadonly: true }
+ Property { name: "activeFocusItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ }
+ Component {
name: "QQuickWindowQmlImpl"
defaultProperty: "data"
prototype: "QQuickWindow"
- exports: ["QtQuick.Window/Window 2.1"]
- exportMetaObjectRevisions: [0]
+ exports: ["QtQuick.Window/Window 2.1", "QtQuick.Window/Window 2.2"]
+ exportMetaObjectRevisions: [0, 1]
+ attachedType: "QQuickWindowAttached"
Property { name: "visible"; type: "bool" }
Property { name: "visibility"; type: "Visibility" }
Signal {