From 6e8e9979d0786d7d730528c2888e0e1af4fb96ca Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 9 Feb 2018 15:22:03 +0100
Subject: Make sure we can build with -no-feature-itemmodel

Various pieces of code have to be disabled in this case.

Change-Id: I83b133f17e9f024016a79c9103293627185449d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 src/corelib/itemmodels/qsortfilterproxymodel.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/corelib/itemmodels/qsortfilterproxymodel.h')

diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h
index 196dab2770..907ceb8e6d 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.h
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.h
@@ -41,11 +41,10 @@
 #define QSORTFILTERPROXYMODEL_H
 
 #include <QtCore/qabstractproxymodel.h>
-
-#ifndef QT_NO_SORTFILTERPROXYMODEL
-
 #include <QtCore/qregexp.h>
 
+QT_REQUIRE_CONFIG(sortfilterproxymodel);
+
 QT_BEGIN_NAMESPACE
 
 
@@ -198,6 +197,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_SORTFILTERPROXYMODEL
-
 #endif // QSORTFILTERPROXYMODEL_H
-- 
cgit v1.2.3