Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/widgets/styles/qwindowsxpstyle.cpp
	tests/auto/gui/kernel/qwindow/qwindow.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3

5 files changed, 16 insertions, 27 deletions

diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h
index 5486c60dfb..5ccb5c0fd7 100644
--- a/src/corelib/tools/qbitarray.h
+++ b/src/corelib/tools/qbitarray.h
@@ -72,7 +72,6 @@ public:
     inline int size() const { return (d.size() << 3) - *d.constData(); }
     inline int count() const { return (d.size() << 3) - *d.constData(); }
     int count(bool on) const;
-    // ### Qt 5: Store the number of set bits separately
 
     inline bool isEmpty() const { return d.isEmpty(); }
     inline bool isNull() const { return d.isNull(); }
diff --git a/src/corelib/tools/qelapsedtimer_generic.cpp b/src/corelib/tools/qelapsedtimer_generic.cpp
index 038a15bd37..05214f0698 100644
--- a/src/corelib/tools/qelapsedtimer_generic.cpp
+++ b/src/corelib/tools/qelapsedtimer_generic.cpp
@@ -150,8 +150,8 @@ qint64 QElapsedTimer::msecsSinceReference() const
 /*!
     Returns the number of milliseconds between this QElapsedTimer and \a
     other. If \a other was started before this object, the returned value
-    will be positive. If it was started later, the returned value will be
-    negative.
+    will be negative. If it was started later, the returned value will be
+    positive.
 
     The return value is undefined if this object or \a other were invalidated.
 
@@ -166,7 +166,7 @@ qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const
 /*!
     Returns the number of seconds between this QElapsedTimer and \a other. If
     \a other was started before this object, the returned value will be
-    positive. If it was started later, the returned value will be negative.
+    negative. If it was started later, the returned value will be positive.
 
     The return value is undefined if this object or \a other were invalidated.
 
diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
index eaa20b304a..27264f7e72 100644
--- a/src/corelib/tools/qregularexpression.cpp
+++ b/src/corelib/tools/qregularexpression.cpp
@@ -2153,30 +2153,30 @@ QDebug operator<<(QDebug debug, const QRegularExpression &re)
 */
 QDebug operator<<(QDebug debug, QRegularExpression::PatternOptions patternOptions)
 {
-    QStringList flags;
+    QByteArray flags;
 
     if (patternOptions == QRegularExpression::NoPatternOption) {
-        flags << QLatin1String("NoPatternOption");
+        flags = "NoPatternOption";
     } else {
+        flags.reserve(200); // worst case...
         if (patternOptions & QRegularExpression::CaseInsensitiveOption)
-            flags << QLatin1String("CaseInsensitiveOption");
+            flags.append("CaseInsensitiveOption|");
         if (patternOptions & QRegularExpression::DotMatchesEverythingOption)
-            flags << QLatin1String("DotMatchesEverythingOption");
+            flags.append("DotMatchesEverythingOption|");
         if (patternOptions & QRegularExpression::MultilineOption)
-            flags << QLatin1String("MultilineOption");
+            flags.append("MultilineOption|");
         if (patternOptions & QRegularExpression::ExtendedPatternSyntaxOption)
-            flags << QLatin1String("ExtendedPatternSyntaxOption");
+            flags.append("ExtendedPatternSyntaxOption|");
         if (patternOptions & QRegularExpression::InvertedGreedinessOption)
-            flags << QLatin1String("InvertedGreedinessOption");
+            flags.append("InvertedGreedinessOption|");
         if (patternOptions & QRegularExpression::DontCaptureOption)
-            flags << QLatin1String("DontCaptureOption");
+            flags.append("DontCaptureOption|");
         if (patternOptions & QRegularExpression::UseUnicodePropertiesOption)
-            flags << QLatin1String("UseUnicodePropertiesOption");
+            flags.append("UseUnicodePropertiesOption|");
+        flags.chop(1);
     }
 
-    debug.nospace() << "QRegularExpression::PatternOptions("
-                    << qPrintable(flags.join(QLatin1String("|")))
-                    << ")";
+    debug.nospace() << "QRegularExpression::PatternOptions(" << flags << ")";
 
     return debug.space();
 }
diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc
index 139b017966..b03cce884d 100644
--- a/src/corelib/tools/qset.qdoc
+++ b/src/corelib/tools/qset.qdoc
@@ -589,16 +589,6 @@
 */
 
 /*!
-    \fn QSet<T> QSet::operator-(const QSet<T> &other)
-    \fn QSet<T> QSet::operator|(const QSet<T> &other)
-    \fn QSet<T> QSet::operator+(const QSet<T> &other)
-    \fn QSet<T> QSet::operator&(const QSet<T> &other)
-    \internal
-
-    These will go away in Qt 5.
-*/
-
-/*!
     \class QSet::iterator
     \since 4.2
     \brief The QSet::iterator class provides an STL-style non-const iterator for QSet.
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index c4eef38971..2bb439d703 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -5349,7 +5349,7 @@ QString QString::toUpper() const
     return *this;
 }
 
-// ### Qt 5: Consider whether this function shouldn't be removed See task 202871.
+// ### Qt 6: Consider whether this function shouldn't be removed See task 202871.
 /*!
     Safely builds a formatted string from the format string \a cformat
     and an arbitrary list of arguments.