diff options
author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-01-20 19:03:39 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-20 22:46:32 +0100 |
commit | 12d90d62023419dca6fcd55f4045058fac6fe50b (patch) | |
tree | c133bcdca62f18fcbfe25fe28823007a2ca0fc0c /src/corelib | |
parent | 9bbebb914422262b7b585b6d1dab9d21c4238c44 (diff) |
Add a note for merging QString::contains(QRE, QREM) overloads in Qt 6
Change-Id: I19609b192618287dbac0de2e893e3e9b40d6a969
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/tools/qstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index b7a08928b3..8d449560f2 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -340,7 +340,7 @@ public: int indexOf(const QRegularExpression &re, int from = 0) const; int lastIndexOf(const QRegularExpression &re, int from = -1) const; bool contains(const QRegularExpression &re) const; - bool contains(const QRegularExpression &re, QRegularExpressionMatch *match) const; + bool contains(const QRegularExpression &re, QRegularExpressionMatch *match) const; // ### Qt 6: merge overloads int count(const QRegularExpression &re) const; #endif |