diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-06 01:00:33 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-06 01:00:33 +0200 |
| commit | e5d028941339bbc5f5eaa2dfa5a2bb8d17353f24 (patch) | |
| tree | 3d91bf1dbe6728d8c6f85dd46b5aff67e83d9ae6 /src/corelib/itemmodels | |
| parent | 40cd0f35ef0b27b1451caf393a97b8a4ac8cd4b2 (diff) | |
| parent | 028727c20ca43f1a56bad010354837e238e30024 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I2f6e1c0f649c5098723b776c774a8a689bb60582
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); |