diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp index d742f5e8636668eaa0749c28c3563b474f271e30..847cf163eb51c259e4dd2eaa1b1af48b8e6bee91 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp @@ -161,15 +161,10 @@ Qt4BaseTarget *Qt4DesktopTargetFactory::create(ProjectExplorer::Project *parent, return 0; Qt4DesktopTarget *t = new Qt4DesktopTarget(static_cast<Qt4Project *>(parent), id); - foreach (const BuildConfigurationInfo &info, infos) { - QString displayName = info.version->displayName() + QLatin1Char(' '); - displayName += (info.buildConfig & QtVersion::DebugBuild) ? tr("Debug") : tr("Release"); - t->addQt4BuildConfiguration(displayName, - info.version, - info.buildConfig, - info.additionalArguments, - info.directory); - } + foreach (const BuildConfigurationInfo &info, infos) + t->addQt4BuildConfiguration(msgBuildConfigurationName(info), + info.version, info.buildConfig, + info.additionalArguments, info.directory); t->addDeployConfiguration(t->deployConfigurationFactory()->create(t, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)); diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp index 8fbe4b6c517815c0a7d695f19d3d4663a6bc69ea..edcc0d04a1deed57f3712387eeedc49560e1c7df 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp @@ -161,15 +161,9 @@ Qt4BaseTarget *Qt4SimulatorTargetFactory::create(ProjectExplorer::Project *paren return 0; Qt4SimulatorTarget *t = new Qt4SimulatorTarget(static_cast<Qt4Project *>(parent), id); - foreach (const BuildConfigurationInfo &info, infos) { - QString displayName = info.version->displayName() + QLatin1Char(' '); - displayName += (info.buildConfig & QtVersion::DebugBuild) ? tr("Debug") : tr("Release"); - t->addQt4BuildConfiguration(displayName, - info.version, - info.buildConfig, - info.additionalArguments, - info.directory); - } + foreach (const BuildConfigurationInfo &info, infos) + t->addQt4BuildConfiguration(msgBuildConfigurationName(info), info.version, info.buildConfig, + info.additionalArguments, info.directory); t->addDeployConfiguration(t->deployConfigurationFactory()->create(t, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)); diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp index 4b03f7c8adce1bea8b506338894e07c9b9d15fbf..335aed4ce4ee05f87cbf250db56bd38a8d105208 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp @@ -204,15 +204,10 @@ Qt4BaseTarget *Qt4MaemoTargetFactory::create(ProjectExplorer::Project *parent, target = new Qt4MeegoTarget(static_cast<Qt4Project *>(parent), id); Q_ASSERT(target); - foreach (const BuildConfigurationInfo &info, infos) { - QString displayName = info.version->displayName() + QLatin1Char(' '); - displayName += (info.buildConfig & QtVersion::DebugBuild) ? tr("Debug") : tr("Release"); - target->addQt4BuildConfiguration(displayName, - info.version, - info.buildConfig, - info.additionalArguments, - info.directory); - } + foreach (const BuildConfigurationInfo &info, infos) + target->addQt4BuildConfiguration(msgBuildConfigurationName(info), + info.version, info.buildConfig, + info.additionalArguments, info.directory); target->addDeployConfiguration(target->deployConfigurationFactory()->create(target, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)); target->createApplicationProFiles(); diff --git a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp index 575f2488a2961e018b3e81f2dd05a5c80e25a6ec..1328d66cba7e7991180dc2832f7b9e6499b6ebfc 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp @@ -188,15 +188,10 @@ Qt4BaseTarget *Qt4SymbianTargetFactory::create(ProjectExplorer::Project *parent, if (!canCreate(parent, id)) return 0; Qt4SymbianTarget *t = new Qt4SymbianTarget(static_cast<Qt4Project *>(parent), id); - foreach (const BuildConfigurationInfo &info, infos) { - QString displayName = info.version->displayName() + QLatin1Char(' '); - displayName += (info.buildConfig & QtVersion::DebugBuild) ? tr("Debug") : tr("Release"); - t->addQt4BuildConfiguration(displayName, - info.version, - info.buildConfig, - info.additionalArguments, - info.directory); - } + foreach (const BuildConfigurationInfo &info, infos) + t->addQt4BuildConfiguration(msgBuildConfigurationName(info), + info.version, info.buildConfig, + info.additionalArguments, info.directory); t->addDeployConfiguration(t->deployConfigurationFactory()->create(t, ProjectExplorer::Constants::DEFAULT_DEPLOYCONFIGURATION_ID)); diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index 35e8ed07e2f4d051fcb8adb8cad20284dd06c6b2..454bcff03556493ef2bd876a56b2edfaea58c966 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -759,11 +759,13 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(ProjectExplorer::Target if (!ok || buildConfigurationName.isEmpty()) return 0; + //: Debug build configuration. We recommend not translating it. qt4Target->addQt4BuildConfiguration(tr("%1 Debug").arg(buildConfigurationName), version, (version->defaultBuildConfig() | QtVersion::DebugBuild), QString(), QString()); BuildConfiguration *bc = + //: Release build configuration. We recommend not translating it. qt4Target->addQt4BuildConfiguration(tr("%1 Release").arg(buildConfigurationName), version, (version->defaultBuildConfig() & ~QtVersion::DebugBuild), diff --git a/src/plugins/qt4projectmanager/qt4target.cpp b/src/plugins/qt4projectmanager/qt4target.cpp index f966894a303f65ba03a9ee34e458e0164fc7a694..72712311baab810ecdacf0d2f3f5902111883e64 100644 --- a/src/plugins/qt4projectmanager/qt4target.cpp +++ b/src/plugins/qt4projectmanager/qt4target.cpp @@ -73,6 +73,17 @@ Qt4BaseTargetFactory *Qt4BaseTargetFactory::qt4BaseTargetFactoryForId(const QStr return 0; } +// Return name of a build configuration. +QString Qt4BaseTargetFactory::msgBuildConfigurationName(const BuildConfigurationInfo &info) +{ + const QString qtVersionName = info.version->displayName(); + return (info.buildConfig & QtVersion::DebugBuild) ? + //: Name of a debug build configuration to created by a project wizard, %1 being the Qt version name. We recommend not translating it. + tr("%1 Debug").arg(qtVersionName) : + //: Name of a release build configuration to created by a project wizard, %1 being the Qt version name. We recommend not translating it. + tr("%1 Release").arg(qtVersionName); +} + // ------------------------------------------------------------------------- // Qt4BaseTarget // ------------------------------------------------------------------------- diff --git a/src/plugins/qt4projectmanager/qt4target.h b/src/plugins/qt4projectmanager/qt4target.h index 955621d602210394e0d4036bf578d4fbf343f008..260fa6752c1e1bc11187824f5e49b5c1b91f095e 100644 --- a/src/plugins/qt4projectmanager/qt4target.h +++ b/src/plugins/qt4projectmanager/qt4target.h @@ -116,6 +116,9 @@ public: QList<BuildConfigurationInfo> infos) = 0; static Qt4BaseTargetFactory *qt4BaseTargetFactoryForId(const QString &id); + +protected: + static QString msgBuildConfigurationName(const BuildConfigurationInfo &info); }; } // namespace Qt4ProjectManager