summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextdocument.h
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@edeltech.ch>2014-08-27 23:14:59 +0200
committerSamuel Gaist <samuel.gaist@edeltech.ch>2014-09-15 09:35:47 +0200
commit4066a6a893dcaa1258e4801fe9e8d2d7624e37f7 (patch)
tree5c0f84f5c06e6b6ae98d2dd1c10b942c35928642 /src/gui/text/qtextdocument.h
parent4e8720d413ceca288408ae34bc726f768ca467c6 (diff)
Add QRegularExpression support to QTextDocument
Currently QTextDocuement only provides find using QRegExp. This patch aims to add support for QRegularExpression. [ChangeLog][QtGui][QTextDocument] Support for searching with a QRegularExpression in a document has been added. Change-Id: I6dba10545b83995d093407038a821fe54db3d261 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/gui/text/qtextdocument.h')
-rw-r--r--src/gui/text/qtextdocument.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h
index 854cb29ed9..3f4b8b565b 100644
--- a/src/gui/text/qtextdocument.h
+++ b/src/gui/text/qtextdocument.h
@@ -169,10 +169,14 @@ public:
QTextCursor find(const QString &subString, int from = 0, FindFlags options = 0) const;
QTextCursor find(const QString &subString, const QTextCursor &from, FindFlags options = 0) const;
-
QTextCursor find(const QRegExp &expr, int from = 0, FindFlags options = 0) const;
QTextCursor find(const QRegExp &expr, const QTextCursor &from, FindFlags options = 0) const;
+#ifndef QT_NO_REGULAREXPRESSION
+ QTextCursor find(const QRegularExpression &expr, int from = 0, FindFlags options = 0) const;
+ QTextCursor find(const QRegularExpression &expr, const QTextCursor &from, FindFlags options = 0) const;
+#endif
+
QTextFrame *frameAt(int pos) const;
QTextFrame *rootFrame() const;