diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-08-25 14:18:45 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2011-08-25 15:05:41 +0200 |
| commit | 0c9dc89d0b7afdbcdbbf2147b2061aeffdbd4b19 (patch) | |
| tree | d7d760fd3d023bac5d4d7c9dee5277f0cff1e8c4 | |
| parent | 4b96d7d8675bcf71011f69018a3716d2c5fba26f (diff) | |
Qt Quick App: Make sure showFullScreen is used for Harmattan
Make sure that the MEEGO_EDITION_HARMATTAN define is actually
picked up for harmattan (it's defined in qplatformdefs.h)
Change-Id: I3a0710992b5fa3e081821a66e32ed4a73eb5dd6e
Reviewed-on: http://codereview.qt.nokia.com/3595
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
| -rw-r--r-- | share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/wizards/qtquickapp.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp index 0b58453b75..d8500a28c4 100644 --- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp @@ -16,6 +16,8 @@ #include <QtDeclarative/QDeclarativeEngine> #include <QtDeclarative/QDeclarativeContext> +#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN + #if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800 #include <qt_private/qdeclarativedebughelper_p.h> diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index 7dabc385ea..859d2da090 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -460,7 +460,7 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const } } -const int QtQuickApp::StubVersion = 14; +const int QtQuickApp::StubVersion = 15; } // namespace Internal } // namespace Qt4ProjectManager |