From 4ca6422bd7b4687c619cd1d66ad0e60f9e920116 Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 19 Apr 2010 15:02:40 +0200 Subject: [PATCH] Do not add "on Maemo device" anymore, since we now have the targets. Task-number: QTCREATOR-207 Reviewed-by: ck --- .../qt4projectmanager/qt-maemo/maemorunconfiguration.cpp | 7 +------ .../qt4projectmanager/qt-maemo/maemorunfactories.cpp | 5 +---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp index 937921c1d74..0e6d1a42fa6 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp @@ -89,12 +89,7 @@ MaemoRunConfiguration::MaemoRunConfiguration(Qt4Target *parent, void MaemoRunConfiguration::init() { - if (!m_proFilePath.isEmpty()) { - setDisplayName(tr("%1 on Maemo device").arg(QFileInfo(m_proFilePath) - .completeBaseName())); - } else { - setDisplayName(tr("MaemoRunConfiguration")); - } + setDisplayName(tr("New Maemo Run Configuration")); updateDeviceConfigurations(); connect(&MaemoDeviceConfigurations::instance(), SIGNAL(updated()), this, diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp index 8810a314482..d5c52617d55 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunfactories.cpp @@ -113,10 +113,7 @@ QStringList MaemoRunConfigurationFactory::availableCreationIds(Target *parent) c QString MaemoRunConfigurationFactory::displayNameForId(const QString &id) const { - const QString &target = targetFromId(id); - if (target.isEmpty()) - return QString(); - return tr("%1 on Maemo Device").arg(QFileInfo(target).completeBaseName()); + return tr("New Maemo Run Configuration"); } RunConfiguration *MaemoRunConfigurationFactory::create(Target *parent,