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>
bb10
Ulf Hermann 2018-02-09 15:38:27 +01:00
parent 4db38197c2
commit 955cf40b18
5 changed files with 35 additions and 3 deletions

View File

@ -14,7 +14,8 @@
"src/xml",
"src/widgets",
"src/printsupport",
"src/plugins/sqldrivers"
"src/plugins/sqldrivers",
"src/testlib"
],
"commandline": {

View File

@ -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" ]
}
]
}

View File

@ -41,6 +41,8 @@
#include <QtGui/QIcon>
#endif
QT_REQUIRE_CONFIG(itemmodeltester);
QT_BEGIN_NAMESPACE
class QAbstractItemModel;

View File

@ -41,6 +41,7 @@
#define QTTESTGLOBAL_H
#include <QtCore/qglobal.h>
#include <QtTest/qttestlib-config.h>
QT_BEGIN_NAMESPACE

View File

@ -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 \