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

Change-Id: If9fd98525b6b4ca07e5e006fc98bf372a73b8a21

4 files changed, 10 insertions, 5 deletions

diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h
index 1774378c06..33a24a3866 100644
--- a/src/corelib/global/qcompilerdetection.h
+++ b/src/corelib/global/qcompilerdetection.h
@@ -910,6 +910,9 @@
 #    undef Q_COMPILER_UNICODE_STRINGS
 #    undef Q_COMPILER_NOEXCEPT
 #  endif
+#  if defined(_HAS_DINKUM_CLIB) && !defined(_HAS_NULLPTR_T)
+#    undef Q_COMPILER_NULLPTR
+#  endif
 #  if defined(_HAS_DINKUM_CLIB) && !defined(_HAS_CONSTEXPR)
 // The libcpp is missing constexpr keywords on important functions like std::numeric_limits<>::min()
 // Disable constexpr support on QNX even if the compiler supports it
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 3006c75794..d462595804 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -205,7 +205,7 @@ Q_STATIC_ASSERT_X(UCHAR_MAX == 255, "Qt assumes that char is 8 bits");
 
     The Q_DECLARE_FLAGS() macro does not expose the flags to the meta-object
     system, so they cannot be used by Qt Script or edited in Qt Designer.
-    To make the flags available for these purposes, the Q_FLAGS() macro must
+    To make the flags available for these purposes, the Q_FLAG() macro must
     be used:
 
     \snippet code/src_corelib_global_qglobal.cpp meta-object flags
@@ -2991,7 +2991,7 @@ QString qt_error_string(int errorCode)
         // Retrieve the system error message for the last-error code.
 #  ifndef Q_OS_WINRT
         wchar_t *string = 0;
-        FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
+        FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER,
                       NULL,
                       errorCode,
                       MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 5db2e94602..2912e68580 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -447,7 +447,7 @@ QLibraryInfo::rawLocation(LibraryLocation loc, PathGroup group)
     if (!QLibraryInfoPrivate::configuration())
 #endif
     {
-        const char *path = 0;
+        const char * volatile path = 0;
         if (loc == PrefixPath) {
             path =
 #ifdef QT_BUILD_QMAKE
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 669bc7a17a..ea174abca9 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -2126,7 +2126,8 @@
            regardless of whether the parent widget is embedded in a scene or
            not.
 
-    \value WindowShadeButtonHint
+    \value WindowShadeButtonHint Adds a shade button in place of the minimize
+           button if the underlying window manager supports it.
 
     \value WindowStaysOnTopHint  Informs the window system that the
            window should stay on top of all other windows. Note that
@@ -2448,8 +2449,9 @@
 
     Flags that alter the behavior:
 
-    \value ImhHiddenText             Characters should be hidden, as is typically used when entering passwords.
+    \value ImhHiddenText             The input method should not show the characters while typing.
                                      This is automatically set when setting QLineEdit::echoMode to \c Password.
+                                     Note that setting \c ImhHiddenText does not change the echo mode.
     \value ImhSensitiveData          Typed text should not be stored by the active input method
                                      in any persistent storage like predictive user dictionary.
     \value ImhNoAutoUppercase        The input method should not try to automatically switch to upper case