whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing QT_NO_REGEXP guard to search functions 

Change-Id: I651243ad5dcdd0dcef20f12f37769bf8c45ae3c5
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
bb10
Samuel Gaist 2014-08-21 22:34:24 +02:00 committed by Konstantin Ritt
parent 9ccc2560c8
commit 1611adc17e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qtextdocument.cpp
View File

@ -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,

3
src/gui/text/qtextdocument.h
View File

@ -161,8 +161,11 @@ public:
QTextCursor find(const QString &subString, int from = 0, FindFlags options = 0) const;
QTextCursor find(const QString &subString, const QTextCursor &cursor, FindFlags options = 0) const;
#ifndef QT_NO_REGEXP
QTextCursor find(const QRegExp &expr, int from = 0, FindFlags options = 0) const;
QTextCursor find(const QRegExp &expr, const QTextCursor &cursor, FindFlags options = 0) const;
#endif
#ifndef QT_NO_REGULAREXPRESSION
QTextCursor find(const QRegularExpression &expr, int from = 0, FindFlags options = 0) const;