diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:12:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:12:21 +0200 |
| commit | 794781e7cff9f7d44af64292796428478ed18663 (patch) | |
| tree | dae1f8478885d95dac5766ce46d5dd4784ca06f4 /src/testlib/testlib.pro | |
| parent | f69d32b535d456a2441754ef5733c7fb65411d6c (diff) | |
| parent | e83f1900f657a41036bd16e917527fcb7a52fd2b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/cocoa/qnsview_mouse.mm
src/testlib/testlib.pro
Change-Id: Ia0ce4243418fe6a485b0f290c67bd433b3b04ff2
Diffstat (limited to 'src/testlib/testlib.pro')
| -rw-r--r-- | src/testlib/testlib.pro | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index c13b851e03..46b61dac07 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 \ @@ -29,7 +28,6 @@ HEADERS = \ qtestdata.h \ qtestevent.h \ qtesteventloop.h \ - qtest_global.h \ qtest_gui.h \ qtest_network.h \ qtest_widgets.h \ @@ -41,10 +39,10 @@ HEADERS = \ qtesttouch.h \ qtestblacklist_p.h \ qtesthelpers_p.h \ + qttestglobal.h \ qtaptestlogger_p.h SOURCES = \ - qabstractitemmodeltester.cpp \ qtestcase.cpp \ qtestlog.cpp \ qtesttable.cpp \ @@ -71,6 +69,14 @@ SOURCES = \ qtestblacklist.cpp \ qtaptestlogger.cpp +qtConfig(itemmodeltester) { + HEADERS += \ + qabstractitemmodeltester.h + + SOURCES += \ + qabstractitemmodeltester.cpp +} + DEFINES *= QT_NO_CAST_TO_ASCII \ QT_NO_CAST_FROM_ASCII \ QT_NO_FOREACH \ |