From 0c9dc89d0b7afdbcdbbf2147b2061aeffdbd4b19 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 25 Aug 2011 14:18:45 +0200
Subject: [PATCH] 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>
---
 .../qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp    | 2 ++
 src/plugins/qt4projectmanager/wizards/qtquickapp.cpp            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
index 0b58453b757..d8500a28c46 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 7dabc385ea0..859d2da0901 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