Remove customexecutable RCs again if they are unused

src/plugins/projectexplorer/customexecutablerunconfiguration.cpp

@@ -371,6 +371,10 @@ QString CustomExecutableRunConfiguration::executable() const
     return exec;
 }
 
+bool CustomExecutableRunConfiguration::isConfigured() const
+{
+    return !m_executable.isEmpty();
+}
 
 LocalApplicationRunConfiguration::RunMode CustomExecutableRunConfiguration::runMode() const
 {

src/plugins/projectexplorer/customexecutablerunconfiguration.h

@@ -76,6 +76,10 @@ public:
      */
     QString executable() const;
 
+    /** Returns whether this runconfiguration ever was configured with a executable
+     */
+    bool isConfigured() const;
+
     /**
      * Returns only what is stored in the internal variable, not what we might
      * get after extending it with a path or asking the user. This value is

src/plugins/qt4projectmanager/qt4project.cpp

@@ -999,6 +999,18 @@ void Qt4Project::checkForNewApplicationProjects()
             if (!found) {
                 qt4Target->addRunConfigurationForPath(qt4proFile->path());
             }
+
+            // Remove unused CustomExecutableRCs:
+            if (target->runConfigurations().count() > 1) {
+                QList<RunConfiguration*> toRemove;
+                foreach (RunConfiguration * rc, target->runConfigurations()) {
+                    CustomExecutableRunConfiguration *cerc = qobject_cast<CustomExecutableRunConfiguration *>(rc);
+                    if (cerc && !cerc->isConfigured())
+                        toRemove.append(rc);
+                }
+                foreach (RunConfiguration *rc, toRemove)
+                    target->removeRunConfiguration(rc);
+            }
         }
     }
 }