Merge remote-tracking branch 'origin/master' into 4.4

Change-Id: I00fe351ee5f2689366c63ba94b042609c47da777

src/plugins/projectexplorer/runconfiguration.cpp

@@ -33,6 +33,7 @@
 #include "environmentaspect.h"
 #include "kitinformation.h"
 #include "runnables.h"
+#include "session.h"
 
 #include <extensionsystem/pluginmanager.h>
 
@@ -243,6 +244,20 @@ void RunConfiguration::ctor()
             [this] { return displayName(); }, false);
 }
 
+/*!
+ * Returns the RunConfiguration of the currently active target
+ * of the startup project, if such exists, or \c nullptr otherwise.
+ */
+
+RunConfiguration *RunConfiguration::startupRunConfiguration()
+{
+    if (Project *pro = SessionManager::startupProject()) {
+        if (const Target *target = pro->activeTarget())
+            return target->activeRunConfiguration();
+    }
+    return nullptr;
+}
+
 /*!
     Checks whether a run configuration is enabled.
 */