diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:23:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-03 10:23:56 +0200 |
| commit | e2f66f921594b7be4af4a058c959557489e86879 (patch) | |
| tree | cc44931708b57bd5a761906797c7dee0360d1d6b /src/corelib/tools/qregularexpression.cpp | |
| parent | 933bf178aab88ab5df8a68cbf02611d6d8744b1b (diff) | |
| parent | 754efa57d89c62d1796e01b407e9222e67450f52 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/global/qnamespace.qdoc
src/corelib/io/qwindowspipereader.cpp
src/corelib/io/qwindowspipereader_p.h
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/plugins/platforms/xcb/qxcbconnection.h
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/tools/qmake/tst_qmake.cpp
tests/manual/touch/main.cpp
Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
Diffstat (limited to 'src/corelib/tools/qregularexpression.cpp')
| -rw-r--r-- | src/corelib/tools/qregularexpression.cpp | 20 |
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 |