diff --git a/share/qtcreator/templates/qt4project/main.cpp b/share/qtcreator/templates/qt4project/main.cpp index dfb26c39b3e15a4b6dc4a11ff7af0dced3f3edbb..8c747ef37057d41e87fc7be2af1d827e17b4a367 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 24f8cf0d4af58cb1b1b3ca787047bc8958eeaccb..960339076b406a86f3e079e5ef8ad4c37b12fd94 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('.');