feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Qt4BuildConfiguration: Allow for "Release" and "Debug" BCs

Browse Source 
No longer require some text additional text.

Change-Id: I0bc1f64e6cbc9577cd4d79e04ce95b24a614ac7f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2013-01-30 18:15:55 +01:00
parent 3db5b1d657
commit 54d0f91b94
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
View File

@@ -150,7 +150,7 @@ AutotoolsBuildConfiguration *AutotoolsBuildConfigurationFactory::create(Target *
bool ok = true; bool ok = true;
QString buildConfigurationName = name; QString buildConfigurationName = name;
if (buildConfigurationName.isEmpty()) if (buildConfigurationName.isNull())
buildConfigurationName = QInputDialog::getText(0, buildConfigurationName = QInputDialog::getText(0,
tr("New Configuration"), tr("New Configuration"),
tr("New configuration name:"), tr("New configuration name:"),

2
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -173,7 +173,7 @@ CMakeBuildConfiguration *CMakeBuildConfigurationFactory::create(ProjectExplorer:
bool ok = true; bool ok = true;
QString buildConfigurationName = name; QString buildConfigurationName = name;
if (buildConfigurationName.isEmpty()) if (buildConfigurationName.isNull())
buildConfigurationName = QInputDialog::getText(0, buildConfigurationName = QInputDialog::getText(0,
tr("New Configuration"), tr("New Configuration"),
tr("New configuration name:"), tr("New configuration name:"),

2
src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
View File

@@ -155,7 +155,7 @@ BuildConfiguration *GenericBuildConfigurationFactory::create(Target *parent, con
// wizards will show up, that incorporate choosing the nam // wizards will show up, that incorporate choosing the nam
bool ok = true; bool ok = true;
QString buildConfigurationName = name; QString buildConfigurationName = name;
if (buildConfigurationName.isEmpty()) if (buildConfigurationName.isNull())
buildConfigurationName = QInputDialog::getText(0, buildConfigurationName = QInputDialog::getText(0,
tr("New Configuration"), tr("New Configuration"),
tr("New configuration name:"), tr("New configuration name:"),

10
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -607,7 +607,7 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(Target *parent, const C
bool ok = true; bool ok = true;
QString buildConfigurationName = name; QString buildConfigurationName = name;
if (buildConfigurationName.isEmpty()) if (buildConfigurationName.isNull())
buildConfigurationName = QInputDialog::getText(0, buildConfigurationName = QInputDialog::getText(0,
tr("New Configuration"), tr("New Configuration"),
tr("New configuration name:"), tr("New configuration name:"),
@@ -618,16 +618,16 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(Target *parent, const C
return 0; return 0;
//: Debug build configuration. We recommend not translating it. //: Debug build configuration. We recommend not translating it.
QString defaultFirstName = tr("%1 Debug").arg(version->displayName()); QString defaultFirstName = tr("%1 Debug").arg(version->displayName()).trimmed();
QString customFirstName; QString customFirstName;
if (buildConfigurationName != version->displayName()) if (buildConfigurationName != version->displayName())
customFirstName = tr("%1 Debug").arg(buildConfigurationName); customFirstName = tr("%1 Debug").arg(buildConfigurationName).trimmed();
//: Release build configuration. We recommend not translating it. //: Release build configuration. We recommend not translating it.
QString defaultSecondName = tr("%1 Release").arg(version->displayName()); QString defaultSecondName = tr("%1 Release").arg(version->displayName()).trimmed();
QString customSecondName; QString customSecondName;
if (buildConfigurationName != version->displayName()) if (buildConfigurationName != version->displayName())
customSecondName = tr("%1 Release").arg(buildConfigurationName); customSecondName = tr("%1 Release").arg(buildConfigurationName).trimmed();
BuildConfiguration *bc BuildConfiguration *bc
= Qt4BuildConfiguration::setup(parent, defaultFirstName, customFirstName, = Qt4BuildConfiguration::setup(parent, defaultFirstName, customFirstName,