Merge remote-tracking branch 'origin/4.3'

Change-Id: I126f3a05212a3d5df78812e66285bc9e8078360b

src/plugins/qbsprojectmanager/qbsnodes.cpp

@@ -454,7 +454,7 @@ QList<ProjectExplorer::RunConfiguration *> QbsProductNode::runConfigurations() c
         QbsRunConfiguration *qbsRc = qobject_cast<QbsRunConfiguration *>(rc);
         if (!qbsRc)
             continue;
-        if (qbsRc->buildSystemTarget() == QbsProject::uniqueProductName(qbsProductData()))
+        if (qbsRc->uniqueProductName() == QbsProject::uniqueProductName(qbsProductData()))
             result << qbsRc;
     }
 

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -161,6 +161,8 @@ QbsProject::~QbsProject()
         m_qbsUpdateFutureInterface = 0;
     }
     qDeleteAll(m_extraCompilers);
+    std::for_each(m_qbsDocuments.cbegin(), m_qbsDocuments.cend(),
+                  [](Core::IDocument *doc) { doc->deleteLater(); });
 }
 
 QbsRootProjectNode *QbsProject::rootProjectNode() const
@@ -974,7 +976,7 @@ void QbsProject::updateCppCodeModel()
             rpp.setDisplayName(grp.name());
             rpp.setProjectFileLocation(grp.location().filePath(),
                                        grp.location().line(), grp.location().column());
-            rpp.setBuildSystemTarget(uniqueProductName(prd));
+            rpp.setBuildSystemTarget(prd.name() + '|' + rpp.projectFile);
 
             QHash<QString, qbs::ArtifactData> filePathToSourceArtifact;
             bool hasCFiles = false;

src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp

@@ -300,6 +300,11 @@ void QbsRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
 }
 
 QString QbsRunConfiguration::buildSystemTarget() const
+{
+    return productDisplayNameFromId(id());
+}
+
+QString QbsRunConfiguration::uniqueProductName() const
 {
     return m_uniqueProductName;
 }

src/plugins/qbsprojectmanager/qbsrunconfiguration.h

@@ -76,6 +76,7 @@ public:
     void addToBaseEnvironment(Utils::Environment &env) const;
 
     QString buildSystemTarget() const final;
+    QString uniqueProductName() const;
     bool isConsoleApplication() const;
 
 signals: