diff options
| author | Samuel Gaist <samuel.gaist@idiap.ch> | 2018-08-24 20:53:23 +0200 |
|---|---|---|
| committer | Samuel Gaist <samuel.gaist@idiap.ch> | 2018-09-03 09:42:58 +0000 |
| commit | fe463dd4228c42d93ffd0a26cb31281b230a8e52 (patch) | |
| tree | d84246232648b63f1db41cc8eeb1533022d838ff /src/corelib/itemmodels | |
| parent | 92739691079e76fbceca1d730d8494c8e1a8105f (diff) | |
QSFPM: cleanup QRegularExpression includes
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>
Diffstat (limited to 'src/corelib/itemmodels')
| -rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/itemmodels/qsortfilterproxymodel.h | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 6b59b0723b..31b9bbc990 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -43,7 +43,6 @@ #include <qdebug.h> #include <qdatetime.h> #include <qpair.h> -#include <qregularexpression.h> #include <qstringlist.h> #include <private/qabstractitemmodel_p.h> #include <private/qabstractproxymodel_p.h> diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h index 0b7c69f37d..1304a95d13 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -42,7 +42,10 @@ #include <QtCore/qabstractproxymodel.h> #include <QtCore/qregexp.h> -#include <QtCore/qregularexpression.h> + +#if QT_CONFIG(regularexpression) +# include <QtCore/qregularexpression.h> +#endif QT_REQUIRE_CONFIG(sortfilterproxymodel); @@ -87,8 +90,10 @@ public: QRegExp filterRegExp() const; void setFilterRegExp(const QRegExp ®Exp); +#if QT_CONFIG(regularexpression) QRegularExpression filterRegularExpression() const; void setFilterRegularExpression(const QRegularExpression ®ularExpression); +#endif int filterKeyColumn() const; void setFilterKeyColumn(int column); |