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 /src/quick/items/qquickscreen.cpp | |
| parent | 26fb6a0915ec64d30eaa78e781e7f18468bc2ed7 (diff) | |
| parent | d8bc98b525c082ed7a2904a985e0daee48b406bb (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I92b91cce499ed4bec64521a581276f397792e218
Diffstat (limited to 'src/quick/items/qquickscreen.cpp')
| -rw-r--r-- | src/quick/items/qquickscreen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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. |