diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-10 16:48:16 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2012-04-17 12:36:31 +0200 |
| commit | 1079f5a1bfe458e709ddcfea4a08f14d68f1434e (patch) | |
| tree | 6b27734b9628bb765ac1723917eb1b69fa43f480 /src/plugins/qt4projectmanager/wizards | |
| parent | 5a01a0c1571bbdd4a4a7ad5888f67b75502b1a6b (diff) | |
| download | qt-creator-1079f5a1bfe458e709ddcfea4a08f14d68f1434e.tar.gz | |
Symbian: Remove support for S60 emulator
The Qt SDK never supported this, so remove it from Qt Creator.
Change-Id: I1da9d658195083aa1b6f5d8119cc03c4984e8d77
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards')
3 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp index 1cfb964739..ed5a18905a 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp @@ -204,8 +204,7 @@ Utils::WizardProgressItem *AbstractMobileAppWizardDialog::itemOfNextGenericPage( bool AbstractMobileAppWizardDialog::isSymbianTargetSelected() const { - return m_targetsPage->isTargetSelected(QLatin1String(Constants::S60_EMULATOR_TARGET_ID)) - || m_targetsPage->isTargetSelected(QLatin1String(Constants::S60_DEVICE_TARGET_ID)); + return m_targetsPage->isTargetSelected(QLatin1String(Constants::S60_DEVICE_TARGET_ID)); } bool AbstractMobileAppWizardDialog::isFremantleTargetSelected() const diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp index 6a72bfe67c..65d32e1843 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp @@ -120,8 +120,7 @@ GuiAppParameters GuiAppWizardDialog::parameters() const || isTargetSelected(QLatin1String(Constants::MEEGO_DEVICE_TARGET_ID))) { rc.widgetWidth = 800; rc.widgetHeight = 480; - } else if (isTargetSelected(QLatin1String(Constants::S60_DEVICE_TARGET_ID)) || - isTargetSelected(QLatin1String(Constants::S60_EMULATOR_TARGET_ID))) { + } else if (isTargetSelected(QLatin1String(Constants::S60_DEVICE_TARGET_ID))) { rc.widgetWidth = 360; rc.widgetHeight = 640; } else { diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp index 9dc08805f2..b973bfb8a3 100644 --- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp @@ -235,8 +235,7 @@ int LibraryWizardDialog::nextId() const int next = m_modulesPageId; - const bool symbianTargetEnabled = isTargetSelected(QLatin1String(Constants::S60_DEVICE_TARGET_ID)) - || isTargetSelected(QLatin1String(Constants::S60_EMULATOR_TARGET_ID)); + const bool symbianTargetEnabled = isTargetSelected(QLatin1String(Constants::S60_DEVICE_TARGET_ID)); // If there was no Symbian target defined we omit "Symbian specific" step // We also omit this step if the library type is not dll |