diff options
Diffstat (limited to 'src/testlib')
-rw-r--r-- | src/testlib/.prev_CMakeLists.txt | 18 | ||||
-rw-r--r-- | src/testlib/CMakeLists.txt | 20 | ||||
-rw-r--r-- | src/testlib/selfcover.cmake | 2 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/testlib/.prev_CMakeLists.txt b/src/testlib/.prev_CMakeLists.txt index 2eef3edbef..a00c4cef13 100644 --- a/src/testlib/.prev_CMakeLists.txt +++ b/src/testlib/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## Test Module: ##################################################################### -qt_add_module(Test +qt_internal_add_module(Test QMAKE_MODULE_CONFIG console testlib_defines EXCEPTIONS SOURCES @@ -72,29 +72,29 @@ qt_add_module(Test #### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded: # QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library" -qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester +qt_internal_extend_target(Test CONDITION QT_FEATURE_itemmodeltester SOURCES qabstractitemmodeltester.cpp qabstractitemmodeltester.h ) -qt_extend_target(Test CONDITION QT_FEATURE_valgrind +qt_internal_extend_target(Test CONDITION QT_FEATURE_valgrind SOURCES qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h ) -qt_extend_target(Test CONDITION embedded +qt_internal_extend_target(Test CONDITION embedded COMPILE_OPTIONS -fno-rtti ) -qt_extend_target(Test CONDITION APPLE +qt_internal_extend_target(Test CONDITION APPLE SOURCES qappletestlogger.cpp qappletestlogger_p.h PUBLIC_LIBRARIES ${FWSecurity} ) -qt_extend_target(Test CONDITION MACOS +qt_internal_extend_target(Test CONDITION MACOS SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES @@ -104,7 +104,7 @@ qt_extend_target(Test CONDITION MACOS ${FWIOKit} ) -qt_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) +qt_internal_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) SOURCES qxctestlogger.mm qxctestlogger_p.h DEFINES @@ -113,7 +113,7 @@ qt_extend_target(Test CONDITION (APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VE ${FWFoundation} ) -qt_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) +qt_internal_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 @@ -133,7 +133,7 @@ qt_extend_target(Test CONDITION ((APPLE) AND (OFF AND NOT lessThan(QMAKE_XCODE_V #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: # HEADERSCLEAN_EXCLUDE = "qtest_network.h" -qt_add_docs(Test +qt_internal_add_docs(Test doc/qttestlib.qdocconf ) diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index 226bf079b8..53005d6402 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -8,7 +8,7 @@ include(selfcover.cmake) ## Test Module: ##################################################################### -qt_add_module(Test +qt_internal_add_module(Test CONFIG_MODULE_NAME testlib # special case EXCEPTIONS SOURCES @@ -77,29 +77,29 @@ qt_add_module(Test #### Keys ignored in scope 2:.:.:testlib.pro:UNIX AND NOT embedded: # QMAKE_PKGCONFIG_DESCRIPTION = "Qt" "Unit" "Testing" "Library" -qt_extend_target(Test CONDITION QT_FEATURE_itemmodeltester +qt_internal_extend_target(Test CONDITION QT_FEATURE_itemmodeltester SOURCES qabstractitemmodeltester.cpp qabstractitemmodeltester.h ) -qt_extend_target(Test CONDITION QT_FEATURE_valgrind +qt_internal_extend_target(Test CONDITION QT_FEATURE_valgrind SOURCES qbenchmarkvalgrind.cpp qbenchmarkvalgrind_p.h ) -qt_extend_target(Test CONDITION embedded +qt_internal_extend_target(Test CONDITION embedded COMPILE_OPTIONS -fno-rtti ) -qt_extend_target(Test CONDITION APPLE +qt_internal_extend_target(Test CONDITION APPLE SOURCES qappletestlogger.cpp qappletestlogger_p.h PUBLIC_LIBRARIES ${FWSecurity} ) -qt_extend_target(Test CONDITION MACOS +qt_internal_extend_target(Test CONDITION MACOS SOURCES qtestutil_macos.mm qtestutil_macos_p.h PUBLIC_LIBRARIES @@ -111,8 +111,8 @@ qt_extend_target(Test CONDITION MACOS # special case begin # Do not bother with disabled stuff: -# extend_target(Test CONDITION (MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ... -# extend_target(Test CONDITION ((MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ... +# qt_internal_extend_target(Test CONDITION (MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ... +# qt_internal_extend_target(Test CONDITION ((MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ... # special case end #### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY: @@ -126,12 +126,12 @@ qt_extend_target(Test CONDITION MACOS #### Keys ignored in scope 12:.:.:testlib.pro:NOT TARGET Qt::Network: # HEADERSCLEAN_EXCLUDE = "qtest_network.h" -qt_add_docs(Test +qt_internal_add_docs(Test doc/qttestlib.qdocconf ) # special case begin -qt_apply_testlib_coverage_options(Test) +qt_internal_apply_testlib_coverage_options(Test) # Allow blacklisting tests depending on whether testlib was built as part of a CMake build. target_compile_definitions(Test PRIVATE QT_CMAKE_BUILD) diff --git a/src/testlib/selfcover.cmake b/src/testlib/selfcover.cmake index c04ffa7b01..83af041951 100644 --- a/src/testlib/selfcover.cmake +++ b/src/testlib/selfcover.cmake @@ -17,7 +17,7 @@ endif() # This enables verification that testlib itself is adequately tested, # as a grounds for trusting that testing with it is useful. -function(qt_apply_testlib_coverage_options target) +function(qt_internal_apply_testlib_coverage_options target) if (NOT FEATURE_testlib_selfcover) return() endif() |