From af9428a6cd68fc4d3ea60a7bf2d4bac41b76fb0f Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Thu, 8 Apr 2010 14:56:56 +0200
Subject: [PATCH] Only add #ifdef for symbian on mobile builds
Reviewed-by: Friedemann Kleint
---
share/qtcreator/templates/qt4project/main.cpp | 6 +-----
.../qt4projectmanager/wizards/guiappwizard.cpp | 12 ++++++++++++
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/share/qtcreator/templates/qt4project/main.cpp b/share/qtcreator/templates/qt4project/main.cpp
index dfb26c39b3e..8c747ef3705 100644
--- a/share/qtcreator/templates/qt4project/main.cpp
+++ b/share/qtcreator/templates/qt4project/main.cpp
@@ -5,10 +5,6 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
%CLASS% w;
-#if defined(Q_WS_S60)
- w.showMaximized();
-#else
- w.show();
-#endif
+ %SHOWMETHOD%
return a.exec();
}
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index 24f8cf0d4af..960339076b4 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -46,6 +46,13 @@
#include <QtGui/QIcon>
static const char *mainSourceFileC = "main";
+static const char *mainSourceShowC = "w.show();\n";
+static const char *mainSourceMobilityShowC = "#if defined(Q_WS_S60)\n"
+" w.showMaximized();\n"
+"#else\n"
+" w.show();\n"
+"#endif\n";
+
static const char *mainWindowUiContentsC =
"\n <widget class=\"QMenuBar\" name=\"menuBar\" />"
"\n <widget class=\"QToolBar\" name=\"mainToolBar\" />"
@@ -242,6 +249,11 @@ bool GuiAppWizard::parametrizeTemplate(const QString &templatePath, const QStrin
contents.replace(QLatin1String("%BASECLASS%"), params.baseClassName);
contents.replace(QLatin1String("%WIDGET_HEIGHT%"), QString::number(params.widgetHeight));
contents.replace(QLatin1String("%WIDGET_WIDTH%"), QString::number(params.widgetWidth));
+ if (params.isMobileApplication)
+ contents.replace(QLatin1String("%SHOWMETHOD%"), QString::fromLatin1(mainSourceMobilityShowC));
+ else
+ contents.replace(QLatin1String("%SHOWMETHOD%"), QString::fromLatin1(mainSourceShowC));
+
const QChar dot = QLatin1Char('.');
--
GitLab