Merge remote-tracking branch 'origin/4.4' into 4.5

Change-Id: Ia5b4d0c1c2b5a410ec3215df1c19b56e236606cf
2017-12-12 10:51:24 +01:00
parent 527fd0fa4c 6e48d0cd31
commit 32377a9ac5
2 changed files with 1535 additions and 985 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "qbs"]
 	path = src/shared/qbs
-	url = ../../qt-labs/qbs.git
+	url = ../../qbs/qbs.git
 	ignore = dirty
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts