Merge remote-tracking branch 'origin/2.7'

Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104

src/libs/qmljs/qmljsmodelmanagerinterface.h

@@ -57,12 +57,12 @@ public:
     {
     public:
         ProjectInfo()
-            : tryQmlDump(false)
+            : tryQmlDump(false), qmlDumpHasRelocatableFlag(true)
         { }
 
         ProjectInfo(QPointer<ProjectExplorer::Project> project)
             : project(project)
-            , tryQmlDump(false)
+            , tryQmlDump(false), qmlDumpHasRelocatableFlag(true)
         { }
 
         operator bool() const
@@ -83,6 +83,7 @@ public:
 
         // whether trying to run qmldump makes sense
         bool tryQmlDump;
+        bool qmlDumpHasRelocatableFlag;
         QString qmlDumpPath;
         ::Utils::Environment qmlDumpEnvironment;