Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
        src/corelib/Qt5CoreConfigExtras.cmake.in
        src/corelib/Qt5CoreMacros.cmake
        src/dbus/Qt5DBusConfigExtras.cmake.in
        src/widgets/Qt5WidgetsConfigExtras.cmake.in

Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7

1 files changed, 4 insertions, 6 deletions

diff --git a/src/corelib/text/qstringlist.cpp b/src/corelib/text/qstringlist.cpp
index 4bbe424ed2..4b9dcee169 100644
--- a/src/corelib/text/qstringlist.cpp
+++ b/src/corelib/text/qstringlist.cpp
@@ -43,9 +43,9 @@
 #if QT_CONFIG(regularexpression)
 #  include <qregularexpression.h>
 #endif
+#include <private/qduplicatetracker_p.h>
 
 #include <algorithm>
-
 QT_BEGIN_NAMESPACE
 
 /*! \typedef QStringListIterator
@@ -885,15 +885,13 @@ int QtPrivate::QStringList_removeDuplicates(QStringList *that)
 {
     int n = that->size();
     int j = 0;
-    QSet<QString> seen;
+
+    QDuplicateTracker<QString> seen;
     seen.reserve(n);
-    int setSize = 0;
     for (int i = 0; i < n; ++i) {
         const QString &s = that->at(i);
-        seen.insert(s);
-        if (setSize == seen.size()) // unchanged size => was already seen
+        if (seen.hasSeen(s))
             continue;
-        ++setSize;
         if (j != i)
             that->swapItemsAt(i, j);
         ++j;