From 38e602d0f2e4c292296d603fda22b366d8879daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@theqtcompany.com>
Date: Tue, 26 Jan 2016 13:46:28 +0100
Subject: Fix QT_DEPRECATED_SINCE usage

The deprecation was introduced in 5.6

Change-Id: Ief6b749b40ec75c3c9f904caed8447bfb5ef5439
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
---
 src/corelib/tools/qshareddata.h         | 2 +-
 src/corelib/tools/qsharedpointer_impl.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/corelib/tools')

diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h
index 6a0900cf3f..bc81135d7a 100644
--- a/src/corelib/tools/qshareddata.h
+++ b/src/corelib/tools/qshareddata.h
@@ -36,7 +36,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 bd98cb326c..70b100d018 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -55,7 +55,7 @@ QT_END_NAMESPACE
 #include <new>
 #include <QtCore/qatomic.h>
 #include <QtCore/qobject.h>    // for qobject_cast
-#if QT_DEPRECATED_SINCE(5, 5)
+#if QT_DEPRECATED_SINCE(5, 6)
 #include <QtCore/qhash.h>
 #endif
 #include <QtCore/qhashfunctions.h>
-- 
cgit v1.2.3


From 70fb36e4bdefa37cff77decac5d549368e805aa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Martins?= <sergio.martins@kdab.com>
Date: Sun, 7 Feb 2016 01:39:37 +0000
Subject: docs: State that QMap::equal_range() returns an open-ended interval

Change-Id: If31dd078aeb92e479db8c1f0a5e58e56b549b5f6
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/corelib/tools/qmap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/tools')

diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index e49a1a098d..27ae07441e 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -1175,7 +1175,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.
 */
 
-- 
cgit v1.2.3