Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: I984770b869d735bc4d7cbd99242e944a47d588c0

.gitignore

@@ -115,6 +115,7 @@ tests/auto/qresourceengine/runtime_resource.rcc
 tools/activeqt/testcon/testcon.tlb
 translations/*.qm
 translations/*_untranslated.ts
+translations/*_en.ts
 qrc_*.cpp
 
 # Test generated files

translations/translations.pro

@@ -78,19 +78,19 @@ check-ts.depends = ts-all
 isEqual(QMAKE_DIR_SEP, /) {
     commit-ts.commands = \
         cd $$PWD/..; \
-        git add -N translations/*_??.ts && \
+        git add -N \"translations/*_??.ts\" && \
         for f in `git diff-files --name-only translations/*_??.ts`; do \
             $$LCONVERT -locations none -i \$\$f -o \$\$f; \
         done; \
-        git add translations/*_??.ts && git commit
+        git add \"translations/*_??.ts\" && git commit
 } else {
     wd = $$replace(PWD, /, \\)\\..
     commit-ts.commands = \
         cd $$wd && \
-        git add -N translations/*_??.ts && \
+        git add -N \"translations/*_??.ts\" && \
         for /f usebackq %%f in (`git diff-files --name-only translations/*_??.ts`) do \
             $$LCONVERT -locations none -i %%f -o %%f $$escape_expand(\\n\\t) \
-        cd $$wd && git add translations/*_??.ts && git commit
+        cd $$wd && git add \"translations/*_??.ts\" && git commit
 }
 
 ts.commands = \