diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp index c6447ddda336b54bc3db1354220f48fdedb2ac9d..891ebf2fea84469512c7105e241abe6b27b39367 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp @@ -50,6 +50,8 @@ static const char *mainWindowUiContentsC = "\n <widget class=\"QToolBar\" name=\"mainToolBar\" />" "\n <widget class=\"QWidget\" name=\"centralWidget\" />" "\n <widget class=\"QStatusBar\" name=\"statusBar\" />"; +static const char *mainWindowMobileUiContentsC = +"\n <widget class=\"QWidget\" name=\"centralWidget\" />"; static const char *baseClassesC[] = { "QMainWindow", "QWidget", "QDialog" }; @@ -224,7 +226,10 @@ bool GuiAppWizard::parametrizeTemplate(const QString &templatePath, const QStrin contents.replace(QLatin1String("%UI_HDR%"), uiHdr); if (params.baseClassName == QLatin1String("QMainWindow")) { - contents.replace(QLatin1String("%CENTRAL_WIDGET%"), QLatin1String(mainWindowUiContentsC)); + if (params.isMobileApplication) + contents.replace(QLatin1String("%CENTRAL_WIDGET%"), QLatin1String(mainWindowMobileUiContentsC)); + else + contents.replace(QLatin1String("%CENTRAL_WIDGET%"), QLatin1String(mainWindowUiContentsC)); } else { contents.remove(QLatin1String("%CENTRAL_WIDGET%")); } diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp index 0034b1bac17b4695cadc07aab9f47ae57d4e9ec2..0f3959b1883158f9fb072e3b29f23e898b8fb2bb 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp @@ -40,7 +40,8 @@ namespace Qt4ProjectManager { namespace Internal { GuiAppParameters::GuiAppParameters() - : designerForm(true) + : designerForm(true), + isMobileApplication(false) { } @@ -108,6 +109,7 @@ GuiAppParameters GuiAppWizardDialog::parameters() const rc.headerFileName = m_filesPage->headerFileName(); rc.formFileName = m_filesPage->formFileName(); rc.designerForm = m_filesPage->formInputChecked(); + rc.isMobileApplication = true; QSet<QString> targets = selectedTargets(); if (targets.contains(QLatin1String(Constants::MAEMO_DEVICE_TARGET_ID))) { rc.widgetWidth = 800; @@ -117,6 +119,7 @@ GuiAppParameters GuiAppWizardDialog::parameters() const rc.widgetWidth = 360; rc.widgetHeight = 640; } else { + rc.isMobileApplication = false; rc.widgetWidth = 400; rc.widgetHeight = 300; } diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h index 6830acc8fd57a3e5460070790fe883c3728169b4..7797627950338ede0ad0eeff8c3a5ecedd8d2099 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h +++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h @@ -50,6 +50,7 @@ struct GuiAppParameters int widgetWidth; int widgetHeight; bool designerForm; + bool isMobileApplication; }; class GuiAppWizardDialog : public BaseQt4ProjectWizardDialog