diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 15:49:28 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:30:00 +0000 |
| commit | 7c229d3cf80d66c0261f7e63ac9b918e2cea4e57 (patch) | |
| tree | 514e825d7b33de388ce1558efa9bc327141d363a /src/qmltest | |
| parent | 1d333d3375874efb8d37df37dc5ef561573794ad (diff) | |
Post merge fixes
Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/qmltest/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/qmltest/.prev_CMakeLists.txt b/src/qmltest/.prev_CMakeLists.txt index ee1b7d39ab..288a5190a5 100644 --- a/src/qmltest/.prev_CMakeLists.txt +++ b/src/qmltest/.prev_CMakeLists.txt @@ -5,21 +5,19 @@ ##################################################################### qt_add_module(QuickTest + GENERATE_METATYPES QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} SOURCES qtestoptions_p.h quicktest.cpp quicktest.h - quicktestevent.cpp quicktestevent_p.h quicktestglobal.h quicktestresult.cpp quicktestresult_p.h - quicktestutil.cpp quicktestutil_p.h DEFINES QT_NO_FOREACH QT_NO_URL_CAST_FROM_STRING LIBRARIES Qt::CorePrivate Qt::Gui - Qt::GuiPrivate Qt::QmlPrivate Qt::Quick Qt::QuickPrivate diff --git a/src/qmltest/CMakeLists.txt b/src/qmltest/CMakeLists.txt index 4760481e35..269e176394 100644 --- a/src/qmltest/CMakeLists.txt +++ b/src/qmltest/CMakeLists.txt @@ -5,14 +5,13 @@ ##################################################################### qt_add_module(QuickTest + GENERATE_METATYPES QMAKE_MODULE_CONFIG $${QT.testlib.CONFIG} SOURCES qtestoptions_p.h quicktest.cpp quicktest.h - quicktestevent.cpp quicktestevent_p.h quicktestglobal.h quicktestresult.cpp quicktestresult_p.h - quicktestutil.cpp quicktestutil_p.h DEFINES QT_NO_FOREACH QT_NO_URL_CAST_FROM_STRING @@ -20,7 +19,6 @@ qt_add_module(QuickTest LIBRARIES Qt::CorePrivate Qt::Gui - Qt::GuiPrivate Qt::QmlPrivate Qt::Quick Qt::QuickPrivate |