Merge remote-tracking branch 'origin/2.6'

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

Change-Id: I288eeb1137e1b08d6c0d69f394cbb0fe1a937b68

src/libs/qmljs/qmljsmodelmanagerinterface.h

@@ -84,6 +84,7 @@ public:
         ::Utils::Environment qmlDumpEnvironment;
 
         QString qtImportsPath;
+        QString qtQmlPath;
         QString qtVersionString;
     };