diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:18:27 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:18:27 +0200 |
commit | 06c2ddc88c6d7b0cf4d90b0c373462a06a1e7b1c (patch) | |
tree | 30544a44db8dd7dd1be547225b7c021407b6db57 | |
parent | 26fb6a0915ec64d30eaa78e781e7f18468bc2ed7 (diff) | |
parent | d8bc98b525c082ed7a2904a985e0daee48b406bb (diff) |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I92b91cce499ed4bec64521a581276f397792e218
-rw-r--r-- | examples/quick/demos/samegame/doc/src/samegame.qdoc | 3 | ||||
-rw-r--r-- | src/imports/window/plugin.cpp | 4 | ||||
-rw-r--r-- | src/imports/window/plugins.qmltypes | 17 | ||||
-rw-r--r-- | src/imports/window/window.pro | 2 | ||||
-rw-r--r-- | src/quick/items/qquickscreen.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/examples/quick/demos/samegame/doc/src/samegame.qdoc b/examples/quick/demos/samegame/doc/src/samegame.qdoc index acae8d728f..11fa4b7f05 100644 --- a/examples/quick/demos/samegame/doc/src/samegame.qdoc +++ b/examples/quick/demos/samegame/doc/src/samegame.qdoc @@ -38,6 +38,9 @@ \image qtquick-demo-samegame-med-1.png \image qtquick-demo-samegame-med-2.png + For more details about different parts of the example, see + \l{QML Advanced Tutorial}. + \include examples-run.qdocinc \sa {QML Applications} diff --git a/src/imports/window/plugin.cpp b/src/imports/window/plugin.cpp index 2883ad23de..68ecda2dce 100644 --- a/src/imports/window/plugin.cpp +++ b/src/imports/window/plugin.cpp @@ -38,7 +38,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 @@ -48,7 +48,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 731f60e66e..0d9226d77f 100644 --- a/src/quick/items/qquickscreen.cpp +++ b/src/quick/items/qquickscreen.cpp @@ -62,7 +62,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 5172689208..0dd66e99ea 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -948,7 +948,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 |