diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-13 15:00:38 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-14 09:05:48 +0000 |
| commit | e9a58ba9e55467f8c69e19dd52c2afa7cbb39529 (patch) | |
| tree | 0d9d92641192c7bc7ca7c6d451d7d123d80ea6bb /src/testlib | |
| parent | 38354d7d6132344a322751c91202109d847771b9 (diff) | |
Regenerate src/*
Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/.prev_CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/testlib/CMakeLists.txt | 14 |
2 files changed, 16 insertions, 16 deletions
diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt index 56b5538072..5859ae18fa 100644 --- a/src/testlib/.prev_CMakeLists.txt +++ b/src/testlib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Test Module: ##################################################################### -add_qt_module(Test +qt_add_module(Test QMAKE_MODULE_CONFIG console testlib_defines EXCEPTIONS SOURCES @@ -77,29 +77,29 @@ add_qt_module(Test #### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded: # QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library" -extend_target(Test CONDITION QT_FEATURE_itemmodeltester +qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester SOURCES qabstractitemmodeltester.cpp qabstractitemmodeltester.h ) -extend_target(Test CONDITION QT_FEATURE_valgrind +qt_extend_target(Test CONDITION QT_FEATURE_valgrind SOURCES qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h ) -extend_target(Test CONDITION embedded +qt_extend_target(Test CONDITION embedded COMPILE_OPTIONS -fno-rtti ) -extend_target(Test CONDITION APPLE +qt_extend_target(Test CONDITION APPLE SOURCES qappletestlogger.cpp qappletestlogger_p.h PUBLIC_LIBRARIES ${FWSecurity} ) -extend_target(Test CONDITION APPLE_OSX +qt_extend_target(Test CONDITION APPLE_OSX SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES @@ -108,7 +108,7 @@ extend_target(Test CONDITION APPLE_OSX ${FWIOKit} ) -extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) +qt_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) SOURCES qxctestlogger.mm qxctestlogger_p.h DEFINES @@ -117,7 +117,7 @@ extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSI ${FWFoundation} ) -extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) +qt_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) COMPILE_OPTIONS -F/Developer/Library/Frameworks LINK_OPTIONS @@ -137,7 +137,7 @@ extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERS #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: # HEADERSCLEAN_EXCLUDE = "qtest_network.h" -add_qt_docs(Test +qt_add_docs(Test doc/qttestlib.qdocconf ) diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index 836c0e21f4..8d8b09beba 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -4,7 +4,7 @@ ## Test Module: ##################################################################### -add_qt_module(Test +qt_add_module(Test CONFIG_MODULE_NAME testlib # special case EXCEPTIONS SOURCES @@ -75,29 +75,29 @@ add_qt_module(Test #### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded: # QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library" -extend_target(Test CONDITION QT_FEATURE_itemmodeltester +qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester SOURCES qabstractitemmodeltester.cpp qabstractitemmodeltester.h ) -extend_target(Test CONDITION QT_FEATURE_valgrind +qt_extend_target(Test CONDITION QT_FEATURE_valgrind SOURCES qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h ) -extend_target(Test CONDITION embedded +qt_extend_target(Test CONDITION embedded COMPILE_OPTIONS -fno-rtti ) -extend_target(Test CONDITION APPLE +qt_extend_target(Test CONDITION APPLE SOURCES qappletestlogger.cpp qappletestlogger_p.h PUBLIC_LIBRARIES ${FWSecurity} ) -extend_target(Test CONDITION APPLE_OSX +qt_extend_target(Test CONDITION APPLE_OSX SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES @@ -123,7 +123,7 @@ extend_target(Test CONDITION APPLE_OSX #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: # HEADERSCLEAN_EXCLUDE = "qtest_network.h" -add_qt_docs(Test +qt_add_docs(Test doc/qttestlib.qdocconf ) |