AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSFPM: cleanup QRegularExpression includes

Browse Source 
Add feature guard around the include in the header and remove the one
from the implementation file.

Change-Id: I8dc133cce786ead6059cc66b40a0ffb6c420096f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Samuel Gaist 2018-08-24 20:53:23 +02:00
parent 9273969107
commit fe463dd422
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/itemmodels/qsortfilterproxymodel.cpp
View File

@ -43,7 +43,6 @@
#include <qdebug.h> #include <qdebug.h>
#include <qdatetime.h> #include <qdatetime.h>
#include <qpair.h> #include <qpair.h>
#include <qregularexpression.h>
#include <qstringlist.h> #include <qstringlist.h>
#include <private/qabstractitemmodel_p.h> #include <private/qabstractitemmodel_p.h>
#include <private/qabstractproxymodel_p.h> #include <private/qabstractproxymodel_p.h>

7
src/corelib/itemmodels/qsortfilterproxymodel.h
View File

@ -42,7 +42,10 @@
#include <QtCore/qabstractproxymodel.h> #include <QtCore/qabstractproxymodel.h>
#include <QtCore/qregexp.h> #include <QtCore/qregexp.h>
#include <QtCore/qregularexpression.h>
#if QT_CONFIG(regularexpression)
# include <QtCore/qregularexpression.h>
#endif
QT_REQUIRE_CONFIG(sortfilterproxymodel); QT_REQUIRE_CONFIG(sortfilterproxymodel);
@ -87,8 +90,10 @@ public:
QRegExp filterRegExp() const; QRegExp filterRegExp() const;
void setFilterRegExp(const QRegExp &regExp); void setFilterRegExp(const QRegExp &regExp);
#if QT_CONFIG(regularexpression)
QRegularExpression filterRegularExpression() const; QRegularExpression filterRegularExpression() const;
void setFilterRegularExpression(const QRegularExpression &regularExpression); void setFilterRegularExpression(const QRegularExpression &regularExpression);
#endif
int filterKeyColumn() const; int filterKeyColumn() const;
void setFilterKeyColumn(int column); void setFilterKeyColumn(int column);