Merge remote-tracking branch 'origin/4.7'

Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h

Change-Id: I192b9e88f967182f3275b4b98abed1220c26daac

src/plugins/qbsprojectmanager/qbsnodes.cpp

@@ -353,6 +353,15 @@ bool QbsGroupNode::renameFile(const QString &filePath, const QString &newFilePat
                                                    prdNode->qbsProductData(), m_qbsGroupData);
 }
 
+FolderNode::AddNewInformation QbsGroupNode::addNewInformation(const QStringList &files,
+                                                              Node *context) const
+{
+    AddNewInformation info = QbsBaseProjectNode::addNewInformation(files, context);
+    if (context != this)
+        --info.priority;
+    return info;
+}
+
 // --------------------------------------------------------------------
 // QbsProductNode:
 // --------------------------------------------------------------------

src/plugins/qbsprojectmanager/qbsnodes.h

@@ -89,6 +89,8 @@ public:
     qbs::GroupData qbsGroupData() const { return m_qbsGroupData; }
 
 private:
+    AddNewInformation addNewInformation(const QStringList &files, Node *context) const override;
+
     qbs::GroupData m_qbsGroupData;
     QString m_productPath;
 };

src/plugins/qbsprojectmanager/qbsrunconfiguration.h

@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <projectexplorer/runnables.h>
+#include <projectexplorer/runconfiguration.h>
 
 #include <QHash>
 #include <QPair>