Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d

src/plugins/qmlprojectmanager/qmlproject.h

@@ -37,6 +37,7 @@
 #include <QDeclarativeEngine>
 #include <QPointer>
 
+namespace ProjectExplorer { class RunConfiguration; }
 namespace QmlJS { class ModelManagerInterface; }
 namespace Utils { class FileSystemWatcher; }
 
@@ -95,6 +96,8 @@ public:
 
 private slots:
     void refreshFiles(const QSet<QString> &added, const QSet<QString> &removed);
+    void addedTarget(ProjectExplorer::Target *target);
+    void addedRunConfiguration(ProjectExplorer::RunConfiguration *);
 
 protected:
     bool fromMap(const QVariantMap &map);