From 07d025603c17898b2a5e388d0f9a53497d7f3784 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 26 Feb 2010 11:30:11 +0100 Subject: [PATCH] Remove Maemo emulator * kh1 says there is no such thing as there is no technical destinction between Maemo devices and the Maemo emulator. Reviewed-by: kh1 --- .../projectexplorer/images/MaemoEmulator.png | Bin 1406 -> 0 bytes src/plugins/projectexplorer/projectexplorer.qrc | 1 - .../qt-maemo/maemorunfactories.cpp | 16 +++++----------- src/plugins/qt4projectmanager/qt4target.cpp | 9 ++------- src/plugins/qt4projectmanager/qt4target.h | 1 - src/plugins/qt4projectmanager/qtoptionspage.cpp | 3 +-- .../qt4projectmanager/qtversionmanager.cpp | 1 - .../wizards/guiappwizarddialog.cpp | 3 +-- 8 files changed, 9 insertions(+), 25 deletions(-) delete mode 100644 src/plugins/projectexplorer/images/MaemoEmulator.png diff --git a/src/plugins/projectexplorer/images/MaemoEmulator.png b/src/plugins/projectexplorer/images/MaemoEmulator.png deleted file mode 100644 index 43558efcfe4ea68a2505538fd161d95f81b4075c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1406 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}k|nMYCBgY=CFO}lsSJ)O z`AMk?p1FzXsX?iUDV2pMQ*9U+SQR{7978H@tqG6KkO>vB+q^rIr+3>T!?1EFv{rN|v|U=>p~;bT>(^%m4UVZ9N5n6(ubi6jvRU8=`_e5JoF?q+R2{SKeP=2Sdo-@WPvi#DMCn`6#?frMU zljY0TudHh<`dLhf4_$P`9_vrYHL0qql5+EX@cHxSJ$!3-1{%DU zS)ebSUAAK#H#ax;M1^g;;tu)P{kb+h;b@1KQHh6EUz3lZ^QFt-CY|5s30NFwJ}$ap zhPG4q(WB)}_dScAJlh^!q>v_)&@S2(ZMg4J`qKDMS8JZFmY?gOKK=h@#|p3CcaLyL zEU@np)#c`}@)3KJtwb*;L= zF;VIJ7GqKO16*$FOO?OwNl=$$3lY{-c-nS)1J`oL%?d5-Keu{Km~}#oZ}Y+sVNHQ~ z=Vyy{bjfloefVQx?VMFw8+xo1Yc+$p`rb7jJa}-MuCc;|Mk%H*hwOH|-LdA+M(*ba zqV`@k*ktR!kLjjs`t_~l=T}}inCD@)LE7)^AC?W}`VQaXE2`h+Z3J&&`TWZ0D${sE}Co)!Fr3udlA>j`h{@cYf6J?F#n1QUBkTA-{(yW>1H270bDp zolMV0iQ=&JX#8z-MV^Y?JJ%7qvI#LPA)&*VAKDLgSqHp78q z`se)CMa#1#L*olsn`ghh#xdv3lZWotHaEqFwjPna>Y#8)i`isliglxy$4`@G%a@zK zo#!j6bjjhZMq%^B#z&5!!4qEFG*xZiVR6xKVdcClU!4jrPl}1wFxVCE$osV0Or$_M z_`6N*f}qn49XZa8sn-^!o0`m8c)Ez^(nszXRrw-+)(84;_MIu#*ZuCCxV6Xja9jGm z|4q+hU)KxAJiMBG;40UKk_B7d`Y1P9@fGAV#4c*&j?^g1Ih|_FUaz~hKtN>9m&+ax z61O?;UhrzF^A^vi=1W%yr&YM@-l8;7xPnjFuKu^>lAF#3ynYMRiVmLV(2jfE;K%sT z$aUFa*6XuG0+!sco@amIVD6t+XH9gTUEdIB`Qg^({*7jC^?#HZYM1|4*!=C~())|} zX6QQZPvJQJ)ir&UqQr++%x4>}+%5cbEjQxuyBV5O3Qq6Z^W*yU|2#_O*U#(Ue^8z? zFMPS=L++EYfsP!uOfu`3uk2yTdV24*@q$ep|3bv|{kHI*3`~2f{juu7ks$7WPx`$x z)<=Amjo9%k^6pxRo74PjMDB2>y!Bgn=)o3c9t&>1FWY#Z&pDv_T}E=HVkmFU<_$Ve zy#qF|>a;7Fm$WOJZ+U%UX+6t?i}FiL3~s)g*mJ~ffy$1B>GJ(g=CFLf_tAOc9RB?! zEN*dj&+>yM6BBlB-MV%0+O@s@_R+QhFOEK)#^P@F>F#;P3W;W!A8PZ@&-YcETw|l$ zWo8xf5+B}eQH$d~e7tf+ME0WpBHKMTpENcyo_JbhU}sl1-S6Xv)Bl-x a80=pLr1H9ysxUAxFnGH9xvXimages/EditorSettings.png images/ProjectDependencies.png images/MaemoDevice.png - images/MaemoEmulator.png images/SymbianDevice.png images/SymbianEmulator.png images/ConnectionOff.png diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp index 5e199b1f0c0..4b7bd331f85 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp @@ -80,8 +80,7 @@ bool MaemoRunConfigurationFactory::canCreate(Target *parent, { Qt4Target *target = qobject_cast(parent); if (!target - || (target->id() != QLatin1String(MAEMO_DEVICE_TARGET_ID) - && target->id() != QLatin1String(MAEMO_EMULATOR_TARGET_ID))) { + || target->id() != QLatin1String(MAEMO_DEVICE_TARGET_ID)) { return false; } return id == QLatin1String(MAEMO_RC_ID); @@ -102,8 +101,7 @@ bool MaemoRunConfigurationFactory::canClone(Target *parent, QStringList MaemoRunConfigurationFactory::availableCreationIds(Target *parent) const { if (Qt4Target *t = qobject_cast(parent)) { - if (t->id() == QLatin1String(MAEMO_DEVICE_TARGET_ID) - || t->id() == QLatin1String(MAEMO_EMULATOR_TARGET_ID)) { + if (t->id() == QLatin1String(MAEMO_DEVICE_TARGET_ID)) { return t->qt4Project()-> applicationProFilePathes(QLatin1String(MAEMO_RC_ID_PREFIX)); } @@ -179,8 +177,7 @@ void MaemoRunConfigurationFactory::projectRemoved( void MaemoRunConfigurationFactory::targetAdded(ProjectExplorer::Target *target) { - if (target->id() != QLatin1String(MAEMO_EMULATOR_TARGET_ID) - && target->id() != QLatin1String(MAEMO_DEVICE_TARGET_ID)) + if (target->id() != QLatin1String(MAEMO_DEVICE_TARGET_ID)) return; MaemoManager::instance().addQemuSimulatorStarter(target->project()); @@ -188,8 +185,7 @@ void MaemoRunConfigurationFactory::targetAdded(ProjectExplorer::Target *target) void MaemoRunConfigurationFactory::targetRemoved(ProjectExplorer::Target *target) { - if (target->id() != QLatin1String(MAEMO_EMULATOR_TARGET_ID) - && target->id() != QLatin1String(MAEMO_DEVICE_TARGET_ID)) + if (target->id() != QLatin1String(MAEMO_DEVICE_TARGET_ID)) return; MaemoManager::instance().removeQemuSimulatorStarter(target->project()); @@ -201,9 +197,7 @@ void MaemoRunConfigurationFactory::currentProjectChanged( if (!project) return; - Target *maemoTarget(project->target(QLatin1String(MAEMO_EMULATOR_TARGET_ID))); - if (!maemoTarget) - maemoTarget = project->target(QLatin1String(MAEMO_DEVICE_TARGET_ID)); + Target *maemoTarget = project->target(QLatin1String(MAEMO_DEVICE_TARGET_ID)); MaemoManager::instance().setQemuSimulatorStarterEnabled(maemoTarget != 0); bool isRunning = false; diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp index 6d3098de1b5..0c677f612d3 100644 --- a/src/plugins/qt4projectmanager/qt4target.cpp +++ b/src/plugins/qt4projectmanager/qt4target.cpp @@ -60,10 +60,8 @@ QString displayNameForId(const QString &id) { return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "Symbian Emulator", "Qt4 Symbian Emulator target display name"); if (id == QLatin1String(S60_DEVICE_TARGET_ID)) return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "Symbian Device", "Qt4 Symbian Device target display name"); - if (id == QLatin1String(MAEMO_EMULATOR_TARGET_ID)) - return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "Maemo Emulator", "Qt4 Maemo Emulator target display name"); if (id == QLatin1String(MAEMO_DEVICE_TARGET_ID)) - return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "Maemo Device", "Qt4 Maemo Device target display name"); + return QApplication::translate("Qt4ProjectManager::Internal::Qt4Target", "Maemo", "Qt4 Maemo target display name"); return QString(); } @@ -74,8 +72,6 @@ QIcon iconForId(const QString &id) { return QIcon(":/projectexplorer/images/SymbianEmulator.png"); if (id == QLatin1String(S60_DEVICE_TARGET_ID)) return QIcon(":/projectexplorer/images/SymbianDevice.png"); - if (id == QLatin1String(MAEMO_EMULATOR_TARGET_ID)) - return QIcon(":/projectexplorer/images/MaemoEmulator.png"); if (id == QLatin1String(MAEMO_DEVICE_TARGET_ID)) return QIcon(":/projectexplorer/images/MaemoDevice.png"); return QIcon(); @@ -370,8 +366,7 @@ void Qt4Target::addRunConfigurationForPath(const QString &proFilePath) addRunConfiguration(new S60EmulatorRunConfiguration(this, proFilePath)); else if (id() == QLatin1String(S60_DEVICE_TARGET_ID)) addRunConfiguration(new S60DeviceRunConfiguration(this, proFilePath)); - else if (id() == QLatin1String(MAEMO_EMULATOR_TARGET_ID) || - id() == QLatin1String(MAEMO_DEVICE_TARGET_ID)) + else if (id() == QLatin1String(MAEMO_DEVICE_TARGET_ID)) addRunConfiguration(new MaemoRunConfiguration(this, proFilePath)); } diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h index 0df9b36bfea..9ee7779cee5 100644 --- a/src/plugins/qt4projectmanager/qt4target.h +++ b/src/plugins/qt4projectmanager/qt4target.h @@ -47,7 +47,6 @@ namespace Internal { const char * const DESKTOP_TARGET_ID("Qt4ProjectManager.Target.DesktopTarget"); const char * const S60_EMULATOR_TARGET_ID("Qt4ProjectManager.Target.S60EmulatorTarget"); const char * const S60_DEVICE_TARGET_ID("Qt4ProjectManager.Target.S60DeviceTarget"); -const char * const MAEMO_EMULATOR_TARGET_ID("Qt4ProjectManager.Target.MaemoEmulatorTarget"); const char * const MAEMO_DEVICE_TARGET_ID("Qt4ProjectManager.Target.MaemoDeviceTarget"); class ProFileReader; diff --git a/src/plugins/qt4projectmanager/qtoptionspage.cpp b/src/plugins/qt4projectmanager/qtoptionspage.cpp index 5daa7fe1575..c255762df1b 100644 --- a/src/plugins/qt4projectmanager/qtoptionspage.cpp +++ b/src/plugins/qt4projectmanager/qtoptionspage.cpp @@ -510,8 +510,7 @@ void QtOptionsPageWidget::showEnvironmentPage(QTreeWidgetItem *item) else if (targets.contains(S60_DEVICE_TARGET_ID) || targets.contains(S60_EMULATOR_TARGET_ID)) envs = tr("Symbian", "Qt Version is meant for Symbian"); - else if (targets.contains(MAEMO_DEVICE_TARGET_ID) || - targets.contains(MAEMO_EMULATOR_TARGET_ID)) + else if (targets.contains(MAEMO_DEVICE_TARGET_ID)) envs = tr("Maemo", "Qt Version is meant for Maemo"); else envs = tr("unkown", "No idea what this Qt Version is meant for!"); diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index eb68a3b76d4..40758e81fcc 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1258,7 +1258,6 @@ void QtVersion::updateToolChainAndMkspec() const } else if (qt_arch == "arm" && MaemoManager::instance().isValidMaemoQtVersion(this)) { m_toolChains << ToolChainPtr(MaemoManager::instance().maemoToolChain(this)); - m_targetIds.insert(QLatin1String(MAEMO_EMULATOR_TARGET_ID)); m_targetIds.insert(QLatin1String(MAEMO_DEVICE_TARGET_ID)); } else if (qmakeCXX == "cl" || qmakeCXX == "icl") { // TODO proper support for intel cl diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp index 05375ec95d5..93abab41729 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp @@ -108,8 +108,7 @@ GuiAppParameters GuiAppWizardDialog::parameters() const rc.formFileName = m_filesPage->formFileName(); rc.designerForm = m_filesPage->formInputChecked(); QSet targets = selectedTargets(); - if (targets.contains(QLatin1String(MAEMO_DEVICE_TARGET_ID)) || - targets.contains(QLatin1String(MAEMO_EMULATOR_TARGET_ID))) { + if (targets.contains(QLatin1String(MAEMO_DEVICE_TARGET_ID))) { rc.widgetWidth = 800; rc.widgetHeight = 480; } else if (targets.contains(QLatin1String(S60_DEVICE_TARGET_ID)) ||