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>

14 files changed, 53 insertions, 51 deletions

diff --git a/src/corelib/itemmodels/itemmodels.pri b/src/corelib/itemmodels/itemmodels.pri
index 83ec4c5dbf..068a8c4b3a 100644
--- a/src/corelib/itemmodels/itemmodels.pri
+++ b/src/corelib/itemmodels/itemmodels.pri
@@ -1,20 +1,46 @@
 # Qt itemmodels core module
 
+!qtConfig(itemmodel): return()
+
 HEADERS += \
     itemmodels/qabstractitemmodel.h \
     itemmodels/qabstractitemmodel_p.h \
-    itemmodels/qabstractproxymodel.h \
-    itemmodels/qabstractproxymodel_p.h \
     itemmodels/qitemselectionmodel.h \
-    itemmodels/qitemselectionmodel_p.h \
-    itemmodels/qidentityproxymodel.h \
-    itemmodels/qsortfilterproxymodel.h \
-    itemmodels/qstringlistmodel.h
+    itemmodels/qitemselectionmodel_p.h
 
 SOURCES += \
     itemmodels/qabstractitemmodel.cpp \
-    itemmodels/qabstractproxymodel.cpp \
-    itemmodels/qitemselectionmodel.cpp \
-    itemmodels/qidentityproxymodel.cpp \
-    itemmodels/qsortfilterproxymodel.cpp \
-    itemmodels/qstringlistmodel.cpp
+    itemmodels/qitemselectionmodel.cpp
+
+qtConfig(proxymodel) {
+    HEADERS += \
+        itemmodels/qabstractproxymodel.h \
+        itemmodels/qabstractproxymodel_p.h
+
+    SOURCES += \
+        itemmodels/qabstractproxymodel.cpp
+
+    qtConfig(identityproxymodel) {
+        HEADERS += \
+            itemmodels/qidentityproxymodel.h
+
+        SOURCES += \
+            itemmodels/qidentityproxymodel.cpp
+    }
+
+    qtConfig(sortfilterproxymodel) {
+        HEADERS += \
+            itemmodels/qsortfilterproxymodel.h
+
+        SOURCES += \
+            itemmodels/qsortfilterproxymodel.cpp
+    }
+}
+
+qtConfig(stringlistmodel) {
+    HEADERS += \
+        itemmodels/qstringlistmodel.h
+
+    SOURCES += \
+        itemmodels/qstringlistmodel.cpp
+}
diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h
index fca21b9bbc..21171124f9 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
@@ -45,6 +45,8 @@
 #include <QtCore/qhash.h>
 #include <QtCore/qvector.h>
 
+QT_REQUIRE_CONFIG(itemmodel);
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/corelib/itemmodels/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h
index 7086ae730a..12fd93d217 100644
--- a/src/corelib/itemmodels/qabstractitemmodel_p.h
+++ b/src/corelib/itemmodels/qabstractitemmodel_p.h
@@ -60,6 +60,8 @@
 
 QT_BEGIN_NAMESPACE
 
+QT_REQUIRE_CONFIG(itemmodel);
+
 class QPersistentModelIndexData
 {
 public:
diff --git a/src/corelib/itemmodels/qabstractproxymodel.cpp b/src/corelib/itemmodels/qabstractproxymodel.cpp
index 39bfdd7782..b7c49a53e4 100644
--- a/src/corelib/itemmodels/qabstractproxymodel.cpp
+++ b/src/corelib/itemmodels/qabstractproxymodel.cpp
@@ -38,9 +38,6 @@
 ****************************************************************************/
 
 #include "qabstractproxymodel.h"
-
-#ifndef QT_NO_PROXYMODEL
-
 #include "qitemselectionmodel.h"
 #include <private/qabstractproxymodel_p.h>
 #include <QtCore/QSize>
@@ -471,5 +468,3 @@ Qt::DropActions QAbstractProxyModel::supportedDropActions() const
 QT_END_NAMESPACE
 
 #include "moc_qabstractproxymodel.cpp"
-
-#endif // QT_NO_PROXYMODEL
diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h
index 6aa82b21ee..c4e5d67908 100644
--- a/src/corelib/itemmodels/qabstractproxymodel.h
+++ b/src/corelib/itemmodels/qabstractproxymodel.h
@@ -42,10 +42,9 @@
 
 #include <QtCore/qabstractitemmodel.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(proxymodel);
 
-#ifndef QT_NO_PROXYMODEL
+QT_BEGIN_NAMESPACE
 
 class QAbstractProxyModelPrivate;
 class QItemSelection;
@@ -112,8 +111,6 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_sourceModelDestroyed())
 };
 
-#endif // QT_NO_PROXYMODEL
-
 QT_END_NAMESPACE
 
 #endif // QABSTRACTPROXYMODEL_H
diff --git a/src/corelib/itemmodels/qabstractproxymodel_p.h b/src/corelib/itemmodels/qabstractproxymodel_p.h
index 929bf1eb75..3a9f33baba 100644
--- a/src/corelib/itemmodels/qabstractproxymodel_p.h
+++ b/src/corelib/itemmodels/qabstractproxymodel_p.h
@@ -54,7 +54,7 @@
 
 #include "private/qabstractitemmodel_p.h"
 
-#ifndef QT_NO_PROXYMODEL
+QT_REQUIRE_CONFIG(proxymodel);
 
 QT_BEGIN_NAMESPACE
 
@@ -71,6 +71,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_PROXYMODEL
-
 #endif // QABSTRACTPROXYMODEL_P_H
diff --git a/src/corelib/itemmodels/qidentityproxymodel.cpp b/src/corelib/itemmodels/qidentityproxymodel.cpp
index 7c306799d0..e984ec194e 100644
--- a/src/corelib/itemmodels/qidentityproxymodel.cpp
+++ b/src/corelib/itemmodels/qidentityproxymodel.cpp
@@ -38,9 +38,6 @@
 ****************************************************************************/
 
 #include "qidentityproxymodel.h"
-
-#ifndef QT_NO_IDENTITYPROXYMODEL
-
 #include "qitemselectionmodel.h"
 #include <private/qabstractproxymodel_p.h>
 
@@ -616,5 +613,3 @@ void QIdentityProxyModelPrivate::_q_sourceRowsRemoved(const QModelIndex &parent,
 QT_END_NAMESPACE
 
 #include "moc_qidentityproxymodel.cpp"
-
-#endif // QT_NO_IDENTITYPROXYMODEL
diff --git a/src/corelib/itemmodels/qidentityproxymodel.h b/src/corelib/itemmodels/qidentityproxymodel.h
index d2b1ed9498..3e6f5e4c48 100644
--- a/src/corelib/itemmodels/qidentityproxymodel.h
+++ b/src/corelib/itemmodels/qidentityproxymodel.h
@@ -43,7 +43,7 @@
 
 #include <QtCore/qabstractproxymodel.h>
 
-#ifndef QT_NO_IDENTITYPROXYMODEL
+QT_REQUIRE_CONFIG(identityproxymodel);
 
 QT_BEGIN_NAMESPACE
 
@@ -110,7 +110,5 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_IDENTITYPROXYMODEL
-
 #endif // QIDENTITYPROXYMODEL_H
 
diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h
index 091c5a21a5..63e5f0ca9c 100644
--- a/src/corelib/itemmodels/qitemselectionmodel.h
+++ b/src/corelib/itemmodels/qitemselectionmodel.h
@@ -47,6 +47,8 @@
 #include <QtCore/qlist.h>
 #include <QtCore/qabstractitemmodel.h>
 
+QT_REQUIRE_CONFIG(itemmodel);
+
 QT_BEGIN_NAMESPACE
 
 class Q_CORE_EXPORT QItemSelectionRange
diff --git a/src/corelib/itemmodels/qitemselectionmodel_p.h b/src/corelib/itemmodels/qitemselectionmodel_p.h
index dfc0387563..187d4a2c1d 100644
--- a/src/corelib/itemmodels/qitemselectionmodel_p.h
+++ b/src/corelib/itemmodels/qitemselectionmodel_p.h
@@ -53,6 +53,8 @@
 
 #include "private/qobject_p.h"
 
+QT_REQUIRE_CONFIG(itemmodel);
+
 QT_BEGIN_NAMESPACE
 
 class QItemSelectionModelPrivate: public QObjectPrivate
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index 220c6be79e..78093727b8 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -38,9 +38,6 @@
 ****************************************************************************/
 
 #include "qsortfilterproxymodel.h"
-
-#ifndef QT_NO_SORTFILTERPROXYMODEL
-
 #include "qitemselectionmodel.h"
 #include <qsize.h>
 #include <qdebug.h>
@@ -2883,5 +2880,3 @@ QItemSelection QSortFilterProxyModel::mapSelectionFromSource(const QItemSelectio
 QT_END_NAMESPACE
 
 #include "moc_qsortfilterproxymodel.cpp"
-
-#endif // QT_NO_SORTFILTERPROXYMODEL
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
diff --git a/src/corelib/itemmodels/qstringlistmodel.cpp b/src/corelib/itemmodels/qstringlistmodel.cpp
index bcfd88fb19..567e6fa35e 100644
--- a/src/corelib/itemmodels/qstringlistmodel.cpp
+++ b/src/corelib/itemmodels/qstringlistmodel.cpp
@@ -47,8 +47,6 @@
 
 #include <algorithm>
 
-#ifndef QT_NO_STRINGLISTMODEL
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -329,5 +327,3 @@ Qt::DropActions QStringListModel::supportedDropActions() const
 QT_END_NAMESPACE
 
 #include "moc_qstringlistmodel.cpp"
-
-#endif // QT_NO_STRINGLISTMODEL
diff --git a/src/corelib/itemmodels/qstringlistmodel.h b/src/corelib/itemmodels/qstringlistmodel.h
index 38da1022ea..a40c13ae40 100644
--- a/src/corelib/itemmodels/qstringlistmodel.h
+++ b/src/corelib/itemmodels/qstringlistmodel.h
@@ -43,10 +43,9 @@
 #include <QtCore/qabstractitemmodel.h>
 #include <QtCore/qstringlist.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(stringlistmodel);
 
-#ifndef QT_NO_STRINGLISTMODEL
+QT_BEGIN_NAMESPACE
 
 class Q_CORE_EXPORT QStringListModel : public QAbstractListModel
 {
@@ -78,8 +77,6 @@ private:
     QStringList lst;
 };
 
-#endif // QT_NO_STRINGLISTMODEL
-
 QT_END_NAMESPACE
 
 #endif // QSTRINGLISTMODEL_H