Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I897baf92970c540f4d64b6a726ce604791234b1a

scripts/deployqtHelper_mac.sh

@@ -65,7 +65,8 @@ if [ $LLVM_INSTALL_DIR ]; then
         _CLANG_CODEMODEL_LIB="$1/Contents/PlugIns/libClangCodeModel.dylib"
     fi
     # this will just fail when run a second time on libClangCodeModel
-    xcrun install_name_tool -rpath "$LLVM_INSTALL_DIR/lib" "@loader_path/" "$_CLANG_CODEMODEL_LIB" || true
+    xcrun install_name_tool -delete_rpath "$LLVM_INSTALL_DIR/lib" "$_CLANG_CODEMODEL_LIB" || true
+    xcrun install_name_tool -add_rpath "@loader_path/" "$_CLANG_CODEMODEL_LIB" || true
 fi
 
 #### macdeployqt

src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp

@@ -346,10 +346,14 @@ QProcessEnvironment PuppetCreator::processEnvironment() const
     environment.set("QML_BAD_GUI_RENDER_LOOP", "true");
     environment.set("QML_USE_MOCKUPS", "true");
     environment.set("QML_PUPPET_MODE", "true");
-    if (m_puppetVersion == Qml1Puppet)
-        environment.appendOrSet("QML_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep);
-    else
-        environment.appendOrSet("QML2_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep);
+
+    if (m_availablePuppetType != FallbackPuppet) {
+        if (m_puppetVersion == Qml1Puppet)
+            environment.appendOrSet("QML_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep);
+        else
+            environment.appendOrSet("QML2_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep);
+    }
+
     return environment.toProcessEnvironment();
 }