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

Conflicts:
	src/plugins/platforms/xcb/qxcbnativeinterface.cpp
	src/plugins/platforms/xcb/qxcbnativeinterface.h

Change-Id: I31b38ba439b9341d51a01c0fd54bea33f7410076

1 files changed, 6 insertions, 4 deletions

diff --git a/src/corelib/tools/qstringalgorithms_p.h b/src/corelib/tools/qstringalgorithms_p.h
index b4be5c7ec7..65901b0286 100644
--- a/src/corelib/tools/qstringalgorithms_p.h
+++ b/src/corelib/tools/qstringalgorithms_p.h
@@ -120,21 +120,23 @@ template <typename StringType> struct QStringAlgorithms
 
         Char *dst = const_cast<Char *>(result.cbegin());
         Char *ptr = dst;
+        bool unmodified = true;
         forever {
             while (src != end && isSpace(*src))
                 ++src;
             while (src != end && !isSpace(*src))
                 *ptr++ = *src++;
-            if (src != end)
-                *ptr++ = QChar::Space;
-            else
+            if (src == end)
                 break;
+            if (*src != QChar::Space)
+                unmodified = false;
+            *ptr++ = QChar::Space;
         }
         if (ptr != dst && ptr[-1] == QChar::Space)
             --ptr;
 
         int newlen = ptr - dst;
-        if (isConst && newlen == str.size()) {
+        if (isConst && newlen == str.size() && unmodified) {
             // nothing happened, return the original
             return str;
         }