Merge remote-tracking branch 'qt/dev' into dev-highdpi

Conflicts:
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface_p.h
	src/plugins/platforms/xcb/qxcbwindow.cpp

Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf

1 files changed, 20 insertions, 0 deletions

diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
index 18dd2d12c2..47cad6349c 100644
--- a/src/corelib/tools/qregularexpression.cpp
+++ b/src/corelib/tools/qregularexpression.cpp
@@ -1830,6 +1830,13 @@ bool QRegularExpression::operator==(const QRegularExpression &re) const
 }
 
 /*!
+    \fn QRegularExpression & QRegularExpression::operator=(QRegularExpression && re)
+
+    Move-assigns the regular expression \a re to this object, and returns a reference
+    to the copy.  Both the pattern and the pattern options are copied.
+*/
+
+/*!
     \fn bool QRegularExpression::operator!=(const QRegularExpression &re) const
 
     Returns \c true if the regular expression is different from \a re, or
@@ -1956,6 +1963,13 @@ QRegularExpressionMatch &QRegularExpressionMatch::operator=(const QRegularExpres
 }
 
 /*!
+    \fn QRegularExpressionMatch &QRegularExpressionMatch::operator=(QRegularExpressionMatch &&match)
+
+    Move-assigns the match result \a match to this object, and returns a reference
+    to the copy.
+*/
+
+/*!
     \fn void QRegularExpressionMatch::swap(QRegularExpressionMatch &other)
 
     Swaps the match result \a other with this match result. This
@@ -2320,6 +2334,12 @@ QRegularExpressionMatchIterator &QRegularExpressionMatchIterator::operator=(cons
 }
 
 /*!
+    \fn QRegularExpressionMatchIterator &QRegularExpressionMatchIterator::operator=(QRegularExpressionMatchIterator &&iterator)
+
+    Move-assigns the \a iterator to this object.
+*/
+
+/*!
     \fn void QRegularExpressionMatchIterator::swap(QRegularExpressionMatchIterator &other)
 
     Swaps the iterator \a other with this iterator object. This operation is