Merge remote-tracking branch 'origin/3.6'

Conflicts:
	src/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75

tests/system/shared/clang.py

@@ -37,6 +37,7 @@ def startCreatorTryingClang():
     except:
         # ClangCodeModel plugin has not been built - start without it
         test.warning("ClangCodeModel plugin not available - performing test without.")
+        overrideStartApplication()
         startApplication("qtcreator" + SettingsPath)
         return False