diff --git a/src/plugins/projectexplorer/images/MaemoEmulator.png b/src/plugins/projectexplorer/images/MaemoEmulator.png
deleted file mode 100644
index 43558efcfe4ea68a2505538fd161d95f81b4075c..0000000000000000000000000000000000000000
Binary files a/src/plugins/projectexplorer/images/MaemoEmulator.png and /dev/null differ
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index ed37bd2943399a6694288363ebbe0ae9a0b27908..1abb4a1ca4d8d51c6504801c5213e8ff238a6eca 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -32,7 +32,6 @@
<file>images/EditorSettings.png</file>
<file>images/ProjectDependencies.png</file>
<file>images/MaemoDevice.png</file>
- <file>images/MaemoEmulator.png</file>
<file>images/SymbianDevice.png</file>
<file>images/SymbianEmulator.png</file>
<file>images/ConnectionOff.png</file>
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp
index 5e199b1f0c0ad40d36bc2d7957d5b9607e89907c..4b7bd331f859ec54946b7bca5bd5d9a7ca8ae532 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<Qt4Target *>(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<Qt4Target *>(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 6d3098de1b5da18748b85af0dd89fb730d67dc8a..0c677f612d3474daab543c4bdb4e81c3e79276f8 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 0df9b36bfeaebf13953361ba364e83db6303a0fb..9ee7779cee54795e728e51cedd90fbf5e84f8ae0 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 5daa7fe157580c635666888064f45bffd2bd9d8f..c255762df1bbf5d45a84a221b6b66c05b4811ec0 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 eb68a3b76d40593794d695e0d2668236943b88ca..40758e81fcce81f62c734c7366651030f6d5f385 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 05375ec95d5699d8a04a3b0d995074531e2ebff2..93abab417297e9877a705559020e87dc10662cc0 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<QString> 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)) ||