Commit 07d02560 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

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
parent 1c3e5cfe
......@@ -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>
......
......@@ -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;
......
......@@ -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));
}
......
......@@ -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;
......
......@@ -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!");
......
......@@ -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
......
......@@ -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)) ||
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment