From 955cf40b18ba37c46d692206c5fc39e93bfda01c Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 9 Feb 2018 15:38:27 +0100
Subject: [PATCH] Testlib: Add a feature for the item model tester

It depends on QAbstractItemModel, so we need to switch it off if
itemmodel is unavailable.

Change-Id: I97246767a5e387b7a2cee90c34125a8411ef1c4e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
---
 configure.json                         |  3 ++-
 src/testlib/configure.json             | 22 ++++++++++++++++++++++
 src/testlib/qabstractitemmodeltester.h |  2 ++
 src/testlib/qttestglobal.h             |  1 +
 src/testlib/testlib.pro                | 10 ++++++++--
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 src/testlib/configure.json

diff --git a/configure.json b/configure.json
index 003c6c5b90..ae2aa22070 100644
--- a/configure.json
+++ b/configure.json
@@ -14,7 +14,8 @@
         "src/xml",
         "src/widgets",
         "src/printsupport",
-        "src/plugins/sqldrivers"
+        "src/plugins/sqldrivers",
+        "src/testlib"
     ],
 
     "commandline": {
diff --git a/src/testlib/configure.json b/src/testlib/configure.json
new file mode 100644
index 0000000000..c464037205
--- /dev/null
+++ b/src/testlib/configure.json
@@ -0,0 +1,22 @@
+{
+    "module": "testlib",
+    "depends": [
+        "core"
+    ],
+
+    "features": {
+        "itemmodeltester": {
+            "label": "Tester for item models",
+            "purpose": "Provides a utility to test item models.",
+            "condition": "features.itemmodel",
+            "output": [ "publicFeature" ]
+        }
+    },
+
+    "summary": [
+        {
+            "section": "Qt Testlib",
+            "entries": [ "itemmodeltester" ]
+        }
+    ]
+}
diff --git a/src/testlib/qabstractitemmodeltester.h b/src/testlib/qabstractitemmodeltester.h
index e85d7522f7..706c0ac16f 100644
--- a/src/testlib/qabstractitemmodeltester.h
+++ b/src/testlib/qabstractitemmodeltester.h
@@ -41,6 +41,8 @@
 #include <QtGui/QIcon>
 #endif
 
+QT_REQUIRE_CONFIG(itemmodeltester);
+
 QT_BEGIN_NAMESPACE
 
 class QAbstractItemModel;
diff --git a/src/testlib/qttestglobal.h b/src/testlib/qttestglobal.h
index d07464345d..9561e56ba3 100644
--- a/src/testlib/qttestglobal.h
+++ b/src/testlib/qttestglobal.h
@@ -41,6 +41,7 @@
 #define QTTESTGLOBAL_H
 
 #include <QtCore/qglobal.h>
+#include <QtTest/qttestlib-config.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro
index 1e1f21e740..06a6f8b8e5 100644
--- a/src/testlib/testlib.pro
+++ b/src/testlib/testlib.pro
@@ -12,7 +12,6 @@ unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \
 QMAKE_DOCS = $$PWD/doc/qttestlib.qdocconf
 
 HEADERS = \
-    qabstractitemmodeltester.h \
     qbenchmark.h \
     qbenchmark_p.h \
     qbenchmarkmeasurement_p.h \
@@ -43,7 +42,6 @@ HEADERS = \
     qttestglobal.h
 
 SOURCES = \
-    qabstractitemmodeltester.cpp \
     qtestcase.cpp \
     qtestlog.cpp \
     qtesttable.cpp \
@@ -69,6 +67,14 @@ SOURCES = \
     qxunittestlogger.cpp \
     qtestblacklist.cpp
 
+qtConfig(itemmodeltester) {
+    HEADERS += \
+        qabstractitemmodeltester.h
+
+    SOURCES += \
+        qabstractitemmodeltester.cpp
+}
+
 DEFINES *= QT_NO_CAST_TO_ASCII \
     QT_NO_CAST_FROM_ASCII \
     QT_NO_FOREACH \