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

Conflicts:
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp

Change-Id: Ib6955eb874b516b185b45d6c38cec646fbaa95f4

3 files changed, 6 insertions, 2 deletions

diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index 2441de16cd..5e340dbd27 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -252,10 +252,11 @@ static inline void convert_to_wchar_t_elided(wchar_t *d, size_t space, const cha
     if (len + 1 > space) {
         const size_t skip = len - space + 4; // 4 for "..." + '\0'
         s += skip;
+        len -= skip;
         for (int i = 0; i < 3; ++i)
           *d++ = L'.';
     }
-    while (*s)
+    while (len--)
         *d++ = *s++;
     *d++ = 0;
 }
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index b6d8e6fdc8..3cd3f52cff 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1635,7 +1635,8 @@ public:
     };
 
     enum ScrollPhase {
-        ScrollBegin = 1,
+        NoScrollPhase = 0, // Make public in 5.7 or asap
+        ScrollBegin,
         ScrollUpdate,
         ScrollEnd
     };
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index b17a1ab48b..aa3fc63833 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -3089,6 +3089,8 @@
 
     This enum describes the phase of scrolling.
 
+    \omitvalue NoScrollPhase The input device doesn't support scroll phase.
+
     \value ScrollBegin Scrolling is about to begin, but the scrolling
     distance did not yet change.