Merge remote-tracking branch 'origin/3.6'

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

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75

tests/system/suite_debugger/tst_qml_js_console/test.py

@@ -71,6 +71,8 @@ def getQmlJSConsoleOutput():
         result = []
         consoleView = waitForObject(":DebugModeWidget_Debugger::Internal::ConsoleView")
         model = consoleView.model()
+        # old input, output, new input > 2
+        waitFor("model.rowCount() > 2", 2000)
         return dumpItems(model)[:-1]
     except:
         return [""]