From 1611adc17eda0f4a85aea8d9cb4c5d01be0eda41 Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Thu, 21 Aug 2014 22:34:24 +0200 Subject: Add missing QT_NO_REGEXP guard to search functions Change-Id: I651243ad5dcdd0dcef20f12f37769bf8c45ae3c5 Reviewed-by: Konstantin Ritt --- src/gui/text/qtextdocument.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gui/text/qtextdocument.cpp') diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 3820b415a3..3a11266e0a 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -1301,6 +1301,7 @@ QTextCursor QTextDocument::find(const QString &subString, const QTextCursor &cur } +#ifndef QT_NO_REGEXP static bool findInBlock(const QTextBlock &block, const QRegExp &expression, int offset, QTextDocument::FindFlags options, QTextCursor *cursor) { @@ -1420,6 +1421,7 @@ QTextCursor QTextDocument::find(const QRegExp &expr, const QTextCursor &cursor, } return find(expr, pos, options); } +#endif // QT_REGEXP #ifndef QT_NO_REGULAREXPRESSION static bool findInBlock(const QTextBlock &block, const QRegularExpression &expression, int offset, -- cgit v1.2.3