From d8bc98b525c082ed7a2904a985e0daee48b406bb Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Tue, 26 Aug 2014 12:15:31 +0200
Subject: [PATCH] Use QtQuick.Window 2.2
Use version 2.2 in the documentation and for the .qmltypes file.
The revision for properties got dropped in commit 7ceca6ac0 , and
is now dropped from the .qmltypes file, too. The removed signals
are also dropped because of that (because they are implicitly
declared by the property, anyway).
Change-Id: Ia14dd403ce1f098cb378bd7940e8f80f32b770a0
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
---
src/imports/window/plugin.cpp | 4 ++--
src/imports/window/plugins.qmltypes | 17 +++++++----------
src/imports/window/window.pro | 2 +-
src/quick/items/qquickscreen.cpp | 2 +-
src/quick/items/qquickwindow.cpp | 2 +-
5 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/imports/window/plugin.cpp b/src/imports/window/plugin.cpp
index 31c7899027..9c65cf4357 100644
--- a/src/imports/window/plugin.cpp
+++ b/src/imports/window/plugin.cpp
@@ -46,7 +46,7 @@
QT_BEGIN_NAMESPACE
/*!
- \qmlmodule QtQuick.Window 2.1
+ \qmlmodule QtQuick.Window 2.2
\title Qt Quick Window QML Types
\ingroup qmlmodules
\brief Provides QML types for window management
@@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
To use the types in this module, import the module with the following line:
\code
- import QtQuick.Window 2.0
+ import QtQuick.Window 2.2
\endcode
*/
diff --git a/src/imports/window/plugins.qmltypes b/src/imports/window/plugins.qmltypes
index f69359b125..27c0299c32 100644
--- a/src/imports/window/plugins.qmltypes
+++ b/src/imports/window/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.Window 2.0'
+// 'qmlplugindump -nonrelocatable QtQuick.Window 2.2'
Module {
Component {
@@ -31,19 +31,16 @@ Module {
Component {
name: "QQuickScreenAttached"
prototype: "QObject"
- Property { name: "name"; revision: 1; type: "string"; isReadonly: true }
+ Property { name: "name"; type: "string"; isReadonly: true }
Property { name: "width"; type: "int"; isReadonly: true }
Property { name: "height"; type: "int"; isReadonly: true }
- 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: "desktopAvailableWidth"; type: "int"; isReadonly: true }
+ Property { name: "desktopAvailableHeight"; type: "int"; isReadonly: true }
+ Property { name: "logicalPixelDensity"; type: "double"; isReadonly: true }
+ Property { name: "pixelDensity"; 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 }
+ Signal { name: "desktopGeometryChanged" }
Method {
name: "angleBetween"
type: "int"
diff --git a/src/imports/window/window.pro b/src/imports/window/window.pro
index c44fae311d..a938e0eeef 100644
--- a/src/imports/window/window.pro
+++ b/src/imports/window/window.pro
@@ -1,7 +1,7 @@
CXX_MODULE = qml
TARGET = windowplugin
TARGETPATH = QtQuick/Window.2
-IMPORT_VERSION = 2.0
+IMPORT_VERSION = 2.2
SOURCES += \
plugin.cpp
diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp
index 82f4f0af3e..c9dbe88960 100644
--- a/src/quick/items/qquickscreen.cpp
+++ b/src/quick/items/qquickscreen.cpp
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
To use this type, you will need to import the module with the following line:
\code
- import QtQuick.Window 2.1
+ import QtQuick.Window 2.2
\endcode
It is a separate import in order to allow you to have a QML environment
without access to window system features.
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 3c2718dcaf..17b8440e34 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -943,7 +943,7 @@ void QQuickWindowPrivate::cleanup(QSGNode *n)
To use this type, you will need to import the module with the following line:
\code
- import QtQuick.Window 2.1
+ import QtQuick.Window 2.2
\endcode
Omitting this import will allow you to have a QML environment without
--
GitLab