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

No longer require some text additional text.

Change-Id: I0bc1f64e6cbc9577cd4d79e04ce95b24a614ac7f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp

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

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

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

src/plugins/genericprojectmanager/genericbuildconfiguration.cpp

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

src/plugins/qt4projectmanager/qt4buildconfiguration.cpp

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