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

Conflicts:
	mkspecs/features/qt_module.prf
	src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm

Change-Id: I7912c23b02b186831f0e465dbe5d1f9936205439

6 files changed, 5 insertions, 6 deletions

diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp
index a9d3c7f5d8..6587d900d2 100644
--- a/src/corelib/tools/qcommandlineparser.cpp
+++ b/src/corelib/tools/qcommandlineparser.cpp
@@ -1029,7 +1029,7 @@ QString QCommandLineParser::helpText() const
 static QString wrapText(const QString &names, int longestOptionNameString, const QString &description)
 {
     const QLatin1Char nl('\n');
-    QString text = QStringLiteral("  ") + names.leftJustified(longestOptionNameString) + QLatin1Char(' ');
+    QString text = QLatin1String("  ") + names.leftJustified(longestOptionNameString) + QLatin1Char(' ');
     const int indent = text.length();
     int lineStart = 0;
     int lastBreakable = -1;
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 2a4d6da477..90edeca0a8 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -1181,7 +1181,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
 /*!
   \fn QPair<iterator, iterator> QMap::equal_range(const Key &key)
 
-  Returns a pair of iterators delimiting the range of values that
+  Returns a pair of iterators delimiting the range of values \c{[first, second)}, that
   are stored under \a key.
 */
 
diff --git a/src/corelib/tools/qringbuffer.cpp b/src/corelib/tools/qringbuffer.cpp
index 7e2d909dcd..db2004dfd9 100644
--- a/src/corelib/tools/qringbuffer.cpp
+++ b/src/corelib/tools/qringbuffer.cpp
@@ -276,7 +276,6 @@ QByteArray QRingBuffer::read()
     if (tailBuffer == 0) {
         qba.resize(tail);
         tail = 0;
-        buffers.append(QByteArray());
     } else {
         --tailBuffer;
     }
diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h
index 366ce1477f..13b0032605 100644
--- a/src/corelib/tools/qshareddata.h
+++ b/src/corelib/tools/qshareddata.h
@@ -42,7 +42,7 @@
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qatomic.h>
-#if QT_DEPRECATED_SINCE(5, 5)
+#if QT_DEPRECATED_SINCE(5, 6)
 #include <QtCore/qhash.h>
 #endif
 #include <QtCore/qhashfunctions.h>
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index a946191cde..6a5c8f4fe5 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -63,7 +63,7 @@ QT_END_NAMESPACE
 #include <QtCore/qatomic.h>
 #include <QtCore/qobject.h>    // for qobject_cast
 #include <QtCore/qdebug.h>
-#if QT_DEPRECATED_SINCE(5, 5)
+#if QT_DEPRECATED_SINCE(5, 6)
 #include <QtCore/qhash.h>
 #endif
 #include <QtCore/qhashfunctions.h>
diff --git a/src/corelib/tools/qtimezoneprivate_win.cpp b/src/corelib/tools/qtimezoneprivate_win.cpp
index 0984949286..1d19f01b4e 100644
--- a/src/corelib/tools/qtimezoneprivate_win.cpp
+++ b/src/corelib/tools/qtimezoneprivate_win.cpp
@@ -378,7 +378,7 @@ void QWinTimeZonePrivate::init(const QByteArray &ianaId)
             m_standardName = readRegistryString(baseKey, L"Std");
             m_daylightName = readRegistryString(baseKey, L"Dlt");
             // On Vista and later the optional dynamic key holds historic data
-            const QString dynamicKeyPath = baseKeyPath + QStringLiteral("\\Dynamic DST");
+            const QString dynamicKeyPath = baseKeyPath + QLatin1String("\\Dynamic DST");
             HKEY dynamicKey = NULL;
             if (openRegistryKey(dynamicKeyPath, &dynamicKey)) {
                 // Find out the start and end years stored, then iterate over them