From fe463dd4228c42d93ffd0a26cb31281b230a8e52 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Fri, 24 Aug 2018 20:53:23 +0200
Subject: QSFPM: cleanup QRegularExpression includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/corelib/itemmodels/qsortfilterproxymodel.cpp | 1 -
 src/corelib/itemmodels/qsortfilterproxymodel.h   | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/corelib/itemmodels')

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 &regExp);
 
+#if QT_CONFIG(regularexpression)
     QRegularExpression filterRegularExpression() const;
     void setFilterRegularExpression(const QRegularExpression &regularExpression);
+#endif
 
     int filterKeyColumn() const;
     void setFilterKeyColumn(int column);
-- 
cgit v1.2.3