diff options
Diffstat (limited to 'tests/auto/testlib/selftests')
119 files changed, 57 insertions, 809 deletions
diff --git a/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt index 5a102a5f1b..65ef6ac126 100644 --- a/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/assert/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(assert - GUI SOURCES tst_assert.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:assert.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:assert.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/assert/CMakeLists.txt b/tests/auto/testlib/selftests/assert/CMakeLists.txt index e3516907c5..a2904beb96 100644 --- a/tests/auto/testlib/selftests/assert/CMakeLists.txt +++ b/tests/auto/testlib/selftests/assert/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(assert NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_assert.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:assert.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:assert.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt index 6570862a48..755cbecd2e 100644 --- a/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/badxml/.prev_CMakeLists.txt @@ -5,20 +5,12 @@ ##################################################################### add_qt_executable(badxml - GUI SOURCES tst_badxml.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) -#### Keys ignored in scope 1:.:.:badxml.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:badxml.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/badxml/CMakeLists.txt b/tests/auto/testlib/selftests/badxml/CMakeLists.txt index 201b198d33..40870b1983 100644 --- a/tests/auto/testlib/selftests/badxml/CMakeLists.txt +++ b/tests/auto/testlib/selftests/badxml/CMakeLists.txt @@ -7,20 +7,12 @@ add_qt_executable(badxml NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_badxml.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Test ) -#### Keys ignored in scope 1:.:.:badxml.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:badxml.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt index 0a0a1c3864..d6f35cd1de 100644 --- a/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibcallgrind/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(benchlibcallgrind - GUI SOURCES tst_benchlibcallgrind.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:benchlibcallgrind.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchlibcallgrind.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt index 9d6360a032..230d11e391 100644 --- a/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibcallgrind/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(benchlibcallgrind NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_benchlibcallgrind.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:benchlibcallgrind.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchlibcallgrind.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt index 0a16de054f..6b592f7515 100644 --- a/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibcounting/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(benchlibcounting - GUI SOURCES tst_benchlibcounting.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:benchlibcounting.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchlibcounting.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt index 1f483bdebf..d89d5d8447 100644 --- a/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibcounting/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(benchlibcounting NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_benchlibcounting.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:benchlibcounting.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchlibcounting.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt index 5dec354c07..a1c6d6711b 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibeventcounter/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(benchlibeventcounter - GUI SOURCES tst_benchlibeventcounter.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:benchlibeventcounter.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchlibeventcounter.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt index b5e8ddaf86..701d3f12fb 100644 --- a/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibeventcounter/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(benchlibeventcounter NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_benchlibeventcounter.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:benchlibeventcounter.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchlibeventcounter.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt index 68435200f1..d38392c896 100644 --- a/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchliboptions/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(benchliboptions - GUI SOURCES tst_benchliboptions.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:benchliboptions.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchliboptions.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt index 9f70d019bc..b2a704cc28 100644 --- a/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchliboptions/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(benchliboptions NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_benchliboptions.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:benchliboptions.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchliboptions.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt index f30cf1752f..3789558508 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibtickcounter/.prev_CMakeLists.txt @@ -8,17 +8,9 @@ add_qt_executable(benchlibtickcounter GUI SOURCES tst_benchlibtickcounter.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:benchlibtickcounter.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchlibtickcounter.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt index 461b19c950..1edf2826ad 100644 --- a/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibtickcounter/CMakeLists.txt @@ -10,17 +10,9 @@ add_qt_executable(benchlibtickcounter GUI SOURCES tst_benchlibtickcounter.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:benchlibtickcounter.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchlibtickcounter.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt index b3306cdc7a..0e098ace32 100644 --- a/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibwalltime/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(benchlibwalltime - GUI SOURCES tst_benchlibwalltime.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:benchlibwalltime.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchlibwalltime.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt index 2b060e73b9..7debe80c67 100644 --- a/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt +++ b/tests/auto/testlib/selftests/benchlibwalltime/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(benchlibwalltime NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_benchlibwalltime.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:benchlibwalltime.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:benchlibwalltime.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt index 975c934252..d1eae1a783 100644 --- a/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/blacklisted/.prev_CMakeLists.txt @@ -8,17 +8,9 @@ add_qt_executable(blacklisted GUI SOURCES tst_blacklisted.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:blacklisted.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:blacklisted.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt index 5327109fb0..8136abe3ab 100644 --- a/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt +++ b/tests/auto/testlib/selftests/blacklisted/CMakeLists.txt @@ -10,17 +10,9 @@ add_qt_executable(blacklisted GUI SOURCES tst_blacklisted.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:blacklisted.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:blacklisted.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt index a4954a4aa8..417b99571d 100644 --- a/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/cmptest/.prev_CMakeLists.txt @@ -5,16 +5,12 @@ ##################################################################### add_qt_executable(cmptest - GUI SOURCES tst_cmptest.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:cmptest.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### @@ -22,6 +18,3 @@ extend_target(cmptest CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 3:.:.:cmptest.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/cmptest/CMakeLists.txt b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt index b875fb2743..b7698c78f7 100644 --- a/tests/auto/testlib/selftests/cmptest/CMakeLists.txt +++ b/tests/auto/testlib/selftests/cmptest/CMakeLists.txt @@ -7,16 +7,12 @@ add_qt_executable(cmptest NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_cmptest.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:cmptest.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### @@ -24,6 +20,3 @@ extend_target(cmptest CONDITION TARGET Qt::Gui PUBLIC_LIBRARIES Qt::Gui ) - -#### Keys ignored in scope 3:.:.:cmptest.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt index e46ce88453..a49902c26b 100644 --- a/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/commandlinedata/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(commandlinedata - GUI SOURCES tst_commandlinedata.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:commandlinedata.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:commandlinedata.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt index b19434f934..76ce86c9a0 100644 --- a/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/commandlinedata/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(commandlinedata NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_commandlinedata.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:commandlinedata.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:commandlinedata.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt index 3c63b1cb18..8ad3c38e88 100644 --- a/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/counting/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(counting - GUI SOURCES tst_counting.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:counting.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:counting.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/counting/CMakeLists.txt b/tests/auto/testlib/selftests/counting/CMakeLists.txt index d9962b9771..5afeab937b 100644 --- a/tests/auto/testlib/selftests/counting/CMakeLists.txt +++ b/tests/auto/testlib/selftests/counting/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(counting NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_counting.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:counting.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:counting.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt index 3d2a1babd4..2e54976ebc 100644 --- a/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/crashes/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(crashes - GUI SOURCES tst_crashes.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:crashes.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:crashes.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/crashes/CMakeLists.txt b/tests/auto/testlib/selftests/crashes/CMakeLists.txt index 5fe8ae06f7..d1eeffd23c 100644 --- a/tests/auto/testlib/selftests/crashes/CMakeLists.txt +++ b/tests/auto/testlib/selftests/crashes/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(crashes NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_crashes.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:crashes.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:crashes.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt index 32e38eedff..fbe3bfca40 100644 --- a/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/datatable/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(datatable - GUI SOURCES tst_datatable.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:datatable.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:datatable.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/datatable/CMakeLists.txt b/tests/auto/testlib/selftests/datatable/CMakeLists.txt index 1ebcfd871e..cab1fed123 100644 --- a/tests/auto/testlib/selftests/datatable/CMakeLists.txt +++ b/tests/auto/testlib/selftests/datatable/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(datatable NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_datatable.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:datatable.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:datatable.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt index 86e21f3eac..8f0bca0d89 100644 --- a/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/datetime/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(datetime - GUI SOURCES tst_datetime.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:datetime.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:datetime.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/datetime/CMakeLists.txt b/tests/auto/testlib/selftests/datetime/CMakeLists.txt index c47f94664f..9c04c6f0b8 100644 --- a/tests/auto/testlib/selftests/datetime/CMakeLists.txt +++ b/tests/auto/testlib/selftests/datetime/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(datetime NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_datetime.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:datetime.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:datetime.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt index 18c7a526a7..ce2187af0b 100644 --- a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt @@ -5,12 +5,8 @@ ##################################################################### add_qt_executable(tst_deleteLater - GUI SOURCES tst_deleteLater.cpp PUBLIC_LIBRARIES Qt::Test ) - -#### Keys ignored in scope 1:.:.:deleteLater.pro:<TRUE>: -# CONFIG = "-app_bundle" "-debug_and_release_target" diff --git a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt index aa805809bb..78876a9dbb 100644 --- a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt @@ -7,12 +7,8 @@ add_qt_executable(tst_deleteLater NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_deleteLater.cpp PUBLIC_LIBRARIES Qt::Test ) - -#### Keys ignored in scope 1:.:.:deleteLater.pro:<TRUE>: -# CONFIG = "-app_bundle" "-debug_and_release_target" diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt index e88da0040d..48be681cbd 100644 --- a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt @@ -5,12 +5,8 @@ ##################################################################### add_qt_executable(tst_deleteLater_noApp - GUI SOURCES tst_deleteLater_noApp.cpp PUBLIC_LIBRARIES Qt::Test ) - -#### Keys ignored in scope 1:.:.:deleteLater_noApp.pro:<TRUE>: -# CONFIG = "-app_bundle" "-debug_and_release_target" diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt index ee24651757..ddcd19e8e3 100644 --- a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt @@ -7,12 +7,8 @@ add_qt_executable(tst_deleteLater_noApp NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_deleteLater_noApp.cpp PUBLIC_LIBRARIES Qt::Test ) - -#### Keys ignored in scope 1:.:.:deleteLater_noApp.pro:<TRUE>: -# CONFIG = "-app_bundle" "-debug_and_release_target" diff --git a/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt index 907c2329cd..9cab4de93b 100644 --- a/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/differentexec/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(differentexec - GUI SOURCES tst_differentexec.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:differentexec.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:differentexec.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/differentexec/CMakeLists.txt b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt index b55ce5ed11..e5f19c2677 100644 --- a/tests/auto/testlib/selftests/differentexec/CMakeLists.txt +++ b/tests/auto/testlib/selftests/differentexec/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(differentexec NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_differentexec.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:differentexec.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:differentexec.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt index 43b56d0c3f..fdd95e0805 100644 --- a/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/exceptionthrow/.prev_CMakeLists.txt @@ -5,18 +5,12 @@ ##################################################################### add_qt_executable(exceptionthrow - GUI + EXCEPTIONS SOURCES tst_exceptionthrow.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:exceptionthrow.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" "exceptions" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:exceptionthrow.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt index 71d3aa1e74..659e2e2ff3 100644 --- a/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt +++ b/tests/auto/testlib/selftests/exceptionthrow/CMakeLists.txt @@ -8,18 +8,11 @@ add_qt_executable(exceptionthrow EXCEPTIONS NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_exceptionthrow.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:exceptionthrow.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" "exceptions" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:exceptionthrow.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/expected_signaldumper.lightxml b/tests/auto/testlib/selftests/expected_signaldumper.lightxml index 443f649bb6..8ce57e4b84 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.lightxml +++ b/tests/auto/testlib/selftests/expected_signaldumper.lightxml @@ -542,7 +542,7 @@ <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))]]></Description> </Message> <Message type="info" file="" line="0"> - <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())]]></Description> + <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())]]></Description> </Message> <Message type="info" file="" line="0"> <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())]]></Description> diff --git a/tests/auto/testlib/selftests/expected_signaldumper.tap b/tests/auto/testlib/selftests/expected_signaldumper.tap index e2d664f4f1..39419280d4 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.tap +++ b/tests/auto/testlib/selftests/expected_signaldumper.tap @@ -134,7 +134,7 @@ ok 18 - slotEmittingSignalOldSyntax(queued) # Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_) # Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string)) # Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray)) -# Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>()) +# Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>()) # Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>()) # Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_) # Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>()) diff --git a/tests/auto/testlib/selftests/expected_signaldumper.teamcity b/tests/auto/testlib/selftests/expected_signaldumper.teamcity index 0fc568e086..15bb4ddfe1 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.teamcity +++ b/tests/auto/testlib/selftests/expected_signaldumper.teamcity @@ -54,7 +54,7 @@ ##teamcity[testStdOut name='slotEmittingSignalOldSyntax(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()' flowId='tst_Signaldumper'] ##teamcity[testFinished name='slotEmittingSignalOldSyntax(queued)' flowId='tst_Signaldumper'] ##teamcity[testStarted name='variousTypes()' flowId='tst_Signaldumper'] -##teamcity[testStdOut name='variousTypes()' out='INFO: Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))|nINFO: Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())' flowId='tst_Signaldumper'] +##teamcity[testStdOut name='variousTypes()' out='INFO: Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))|nINFO: Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())' flowId='tst_Signaldumper'] ##teamcity[testFinished name='variousTypes()' flowId='tst_Signaldumper'] ##teamcity[testStarted name='deletingSender()' flowId='tst_Signaldumper'] ##teamcity[testStdOut name='deletingSender()' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()' flowId='tst_Signaldumper'] diff --git a/tests/auto/testlib/selftests/expected_signaldumper.txt b/tests/auto/testlib/selftests/expected_signaldumper.txt index 0ee8cd38a2..92d609d14c 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.txt +++ b/tests/auto/testlib/selftests/expected_signaldumper.txt @@ -134,7 +134,7 @@ INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qSt INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_) INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string)) INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray)) -INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>()) +INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>()) INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>()) INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_) INFO : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>()) diff --git a/tests/auto/testlib/selftests/expected_signaldumper.xml b/tests/auto/testlib/selftests/expected_signaldumper.xml index f11a0c3ce6..01b0471268 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.xml +++ b/tests/auto/testlib/selftests/expected_signaldumper.xml @@ -544,7 +544,7 @@ <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))]]></Description> </Message> <Message type="info" file="" line="0"> - <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())]]></Description> + <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())]]></Description> </Message> <Message type="info" file="" line="0"> <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())]]></Description> diff --git a/tests/auto/testlib/selftests/expected_signaldumper.xunitxml b/tests/auto/testlib/selftests/expected_signaldumper.xunitxml index cbf7075ba1..6609f518a2 100644 --- a/tests/auto/testlib/selftests/expected_signaldumper.xunitxml +++ b/tests/auto/testlib/selftests/expected_signaldumper.xunitxml @@ -142,7 +142,7 @@ <!-- message="Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)" type="info" --> <!-- message="Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))" type="info" --> <!-- message="Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))" type="info" --> - <!-- message="Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())" type="info" --> + <!-- message="Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())" type="info" --> <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())" type="info" --> <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)" type="info" --> <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())" type="info" --> @@ -274,7 +274,7 @@ <![CDATA[Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)]]> <![CDATA[Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))]]> <![CDATA[Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))]]> -<![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())]]> +<![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QVector<int>())]]> <![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())]]> <![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)]]> <![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())]]> diff --git a/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt index b4550d999a..175bd8129a 100644 --- a/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/expectfail/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(expectfail - GUI SOURCES tst_expectfail.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:expectfail.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:expectfail.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/expectfail/CMakeLists.txt b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt index bedb74b818..96de8c7a52 100644 --- a/tests/auto/testlib/selftests/expectfail/CMakeLists.txt +++ b/tests/auto/testlib/selftests/expectfail/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(expectfail NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_expectfail.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:expectfail.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:expectfail.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt index 1632518ab4..6369874983 100644 --- a/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/failcleanup/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(failcleanup - GUI SOURCES tst_failcleanup.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:failcleanup.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:failcleanup.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt index eeff7b0075..6994b454b4 100644 --- a/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt +++ b/tests/auto/testlib/selftests/failcleanup/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(failcleanup NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_failcleanup.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:failcleanup.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:failcleanup.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt index 149dea9d5b..e03a4333bd 100644 --- a/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/faildatatype/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(faildatatype - GUI SOURCES tst_faildatatype.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:faildatatype.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:faildatatype.pro:APPLE: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt index 2a3a95e5b3..0bcf274a89 100644 --- a/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt +++ b/tests/auto/testlib/selftests/faildatatype/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(faildatatype NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_faildatatype.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:faildatatype.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:faildatatype.pro:APPLE: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt index c13fa99bae..6ab21d845f 100644 --- a/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/failfetchtype/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(failfetchtype - GUI SOURCES tst_failfetchtype.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:failfetchtype.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:failfetchtype.pro:APPLE: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt index f1f02bcc12..f0d2657be1 100644 --- a/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt +++ b/tests/auto/testlib/selftests/failfetchtype/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(failfetchtype NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_failfetchtype.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:failfetchtype.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:failfetchtype.pro:APPLE: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt index ecc131d290..22817fa186 100644 --- a/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/failinit/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(failinit - GUI SOURCES tst_failinit.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:failinit.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:failinit.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/failinit/CMakeLists.txt b/tests/auto/testlib/selftests/failinit/CMakeLists.txt index 1966b3f007..8eeaa38d20 100644 --- a/tests/auto/testlib/selftests/failinit/CMakeLists.txt +++ b/tests/auto/testlib/selftests/failinit/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(failinit NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_failinit.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:failinit.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:failinit.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt index baecab0501..5d519c9196 100644 --- a/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/failinitdata/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(failinitdata - GUI SOURCES tst_failinitdata.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:failinitdata.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:failinitdata.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt index 7e9fcb49e1..1d62d62234 100644 --- a/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/failinitdata/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(failinitdata NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_failinitdata.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:failinitdata.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:failinitdata.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt index c083406c31..af1ea19d32 100644 --- a/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/fetchbogus/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(fetchbogus - GUI SOURCES tst_fetchbogus.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:fetchbogus.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:fetchbogus.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt index 782241505d..60c06b3410 100644 --- a/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt +++ b/tests/auto/testlib/selftests/fetchbogus/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(fetchbogus NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_fetchbogus.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:fetchbogus.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:fetchbogus.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt index 523e40c169..dc21a4d25f 100644 --- a/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/findtestdata/.prev_CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(findtestdata - GUI SOURCES findtestdata.cpp PUBLIC_LIBRARIES @@ -13,15 +12,17 @@ add_qt_executable(findtestdata ) # Resources: -add_qt_resource(findtestdata "findtestdata" PREFIX "/qt/etc/" FILES - qt.conf) +set(findtestdata_resource_files + "qt.conf" +) +add_qt_resource(findtestdata "findtestdata" + PREFIX + "/qt/etc/" + FILES + ${findtestdata_resource_files} +) -#### Keys ignored in scope 1:.:.:findtestdata.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:findtestdata.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt index 81c171d173..f4987f88a3 100644 --- a/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/findtestdata/CMakeLists.txt @@ -7,7 +7,6 @@ add_qt_executable(findtestdata NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES findtestdata.cpp PUBLIC_LIBRARIES @@ -15,15 +14,17 @@ add_qt_executable(findtestdata ) # Resources: -add_qt_resource(findtestdata "findtestdata" PREFIX "/qt/etc/" FILES - qt.conf) +set(findtestdata_resource_files + "qt.conf" +) +add_qt_resource(findtestdata "findtestdata" + PREFIX + "/qt/etc/" + FILES + ${findtestdata_resource_files} +) -#### Keys ignored in scope 1:.:.:findtestdata.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:findtestdata.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt index af8db7db72..c037179b74 100644 --- a/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/float/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(float - GUI SOURCES tst_float.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:float.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:float.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/float/CMakeLists.txt b/tests/auto/testlib/selftests/float/CMakeLists.txt index c98c447fb2..8a2ee4b76d 100644 --- a/tests/auto/testlib/selftests/float/CMakeLists.txt +++ b/tests/auto/testlib/selftests/float/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(float NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_float.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:float.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:float.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt index eb9af97ab4..1cff8f1b27 100644 --- a/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/globaldata/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(globaldata - GUI SOURCES tst_globaldata.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:globaldata.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:globaldata.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/globaldata/CMakeLists.txt b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt index 3e7ddc0d34..868a637588 100644 --- a/tests/auto/testlib/selftests/globaldata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/globaldata/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(globaldata NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_globaldata.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:globaldata.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:globaldata.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt index 2ba2ab3668..86c58467bf 100644 --- a/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/keyboard/.prev_CMakeLists.txt @@ -5,22 +5,14 @@ ##################################################################### add_qt_executable(keyboard - GUI SOURCES tst_keyboard.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:keyboard.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:keyboard.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt index 7ace48d1e2..2766c1a36c 100644 --- a/tests/auto/testlib/selftests/keyboard/CMakeLists.txt +++ b/tests/auto/testlib/selftests/keyboard/CMakeLists.txt @@ -7,22 +7,14 @@ add_qt_executable(keyboard NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_keyboard.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:keyboard.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:keyboard.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt index 86b039f2e1..9f1c6bc8ad 100644 --- a/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/longstring/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(longstring - GUI SOURCES tst_longstring.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:longstring.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:longstring.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/longstring/CMakeLists.txt b/tests/auto/testlib/selftests/longstring/CMakeLists.txt index 0b221fe8ac..08002fd20d 100644 --- a/tests/auto/testlib/selftests/longstring/CMakeLists.txt +++ b/tests/auto/testlib/selftests/longstring/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(longstring NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_longstring.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:longstring.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:longstring.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt index bab5a9f969..a05c9afb13 100644 --- a/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/maxwarnings/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(maxwarnings - GUI SOURCES maxwarnings.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:maxwarnings.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:maxwarnings.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt index 4059539828..23eaa62629 100644 --- a/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt +++ b/tests/auto/testlib/selftests/maxwarnings/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(maxwarnings NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES maxwarnings.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:maxwarnings.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:maxwarnings.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt index 03a6a56236..4308195d73 100644 --- a/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/mouse/.prev_CMakeLists.txt @@ -5,22 +5,14 @@ ##################################################################### add_qt_executable(mouse - GUI SOURCES tst_mouse.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:mouse.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:mouse.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/mouse/CMakeLists.txt b/tests/auto/testlib/selftests/mouse/CMakeLists.txt index a30d5fecdf..9f6b364cec 100644 --- a/tests/auto/testlib/selftests/mouse/CMakeLists.txt +++ b/tests/auto/testlib/selftests/mouse/CMakeLists.txt @@ -7,22 +7,14 @@ add_qt_executable(mouse NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_mouse.cpp - LIBRARIES - Qt::GuiPrivate - Qt::TestPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:mouse.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:mouse.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/mouse/tst_mouse.cpp b/tests/auto/testlib/selftests/mouse/tst_mouse.cpp index 3c731cde69..d097027e7e 100644 --- a/tests/auto/testlib/selftests/mouse/tst_mouse.cpp +++ b/tests/auto/testlib/selftests/mouse/tst_mouse.cpp @@ -93,31 +93,31 @@ void tst_Mouse::stateHandlingPart1() // verify that we have a clean state after the previous data set QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::NoButton); - QTest::mousePress(&w, Qt::LeftButton, 0, point); + QTest::mousePress(&w, Qt::LeftButton, { }, point); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::LeftButton); - QTest::mousePress(&w, Qt::RightButton, 0, point); + QTest::mousePress(&w, Qt::RightButton, { }, point); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::LeftButton | Qt::RightButton); QTest::mouseMove(&w, point += step); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::LeftButton | Qt::RightButton); - QTest::mouseRelease(&w, Qt::LeftButton, 0, point); + QTest::mouseRelease(&w, Qt::LeftButton, { }, point); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::RightButton); QTest::mouseMove(&w, point += step); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::RightButton); // test invalid input - left button was already released - QTest::mouseRelease(&w, Qt::LeftButton, 0, point += point); + QTest::mouseRelease(&w, Qt::LeftButton, { }, point += point); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::RightButton); // test invalid input - right button is already pressed - QTest::mousePress(&w, Qt::RightButton, 0, point); + QTest::mousePress(&w, Qt::RightButton, { }, point); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::RightButton); // now continue with valid input - QTest::mouseRelease(&w, Qt::RightButton, 0, point += point); + QTest::mouseRelease(&w, Qt::RightButton, { }, point += point); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::NoButton); QTest::mouseMove(&w, point += step); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::NoButton); // exit this test function with some button in a pressed state - QTest::mousePress(&w, Qt::LeftButton, 0, point); - QTest::mousePress(&w, Qt::RightButton, 0, point); + QTest::mousePress(&w, Qt::LeftButton, { }, point); + QTest::mousePress(&w, Qt::RightButton, { }, point); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::LeftButton | Qt::RightButton); } @@ -144,8 +144,8 @@ void tst_Mouse::stateHandlingPart2() QSKIP("Not implemented beyond this point!"); QPoint point(40, 40); - QTest::mousePress(&w, Qt::LeftButton, 0, point); - QTest::mousePress(&w, Qt::RightButton, 0, point); + QTest::mousePress(&w, Qt::LeftButton, { }, point); + QTest::mousePress(&w, Qt::RightButton, { }, point); QCOMPARE(QTestPrivate::qtestMouseButtons, Qt::LeftButton | Qt::RightButton); w.moveCount = 0; // The windowing system will send mouse events with no buttons set @@ -201,11 +201,11 @@ void tst_Mouse::deterministicEvents() QCOMPARE(w.moveCount, 0); static QPoint m_cachedLastCursorPosition; if (firstRun) { - QTest::mousePress(&w, Qt::LeftButton, 0, QPoint(40, 40)); + QTest::mousePress(&w, Qt::LeftButton, { }, QPoint(40, 40)); m_cachedLastCursorPosition = QGuiApplicationPrivate::lastCursorPosition.toPoint(); } else { QPoint point = w.mapFromGlobal(m_cachedLastCursorPosition); - QTest::mousePress(&w, Qt::LeftButton, 0, point); + QTest::mousePress(&w, Qt::LeftButton, { }, point); } QCOMPARE(w.pressCount, 1); QCOMPARE(w.moveCount, 1); diff --git a/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt index 9b0a98dedf..6c237edd05 100644 --- a/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/multiexec/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(multiexec - GUI SOURCES tst_multiexec.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:multiexec.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:multiexec.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/multiexec/CMakeLists.txt b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt index 66d3760e0d..a1174908e5 100644 --- a/tests/auto/testlib/selftests/multiexec/CMakeLists.txt +++ b/tests/auto/testlib/selftests/multiexec/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(multiexec NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_multiexec.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:multiexec.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:multiexec.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt index 4e5d563011..05e8518413 100644 --- a/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/pairdiagnostics/.prev_CMakeLists.txt @@ -5,12 +5,8 @@ ##################################################################### add_qt_executable(pairdiagnostics - GUI SOURCES tst_pairdiagnostics.cpp PUBLIC_LIBRARIES Qt::Test ) - -#### Keys ignored in scope 1:.:.:pairdiagnostics.pro:<TRUE>: -# CONFIG = "-app_bundle" "-debug_and_release_target" diff --git a/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt index 34e5768478..a9a48fb3f2 100644 --- a/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt +++ b/tests/auto/testlib/selftests/pairdiagnostics/CMakeLists.txt @@ -7,12 +7,8 @@ add_qt_executable(pairdiagnostics NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_pairdiagnostics.cpp PUBLIC_LIBRARIES Qt::Test ) - -#### Keys ignored in scope 1:.:.:pairdiagnostics.pro:<TRUE>: -# CONFIG = "-app_bundle" "-debug_and_release_target" diff --git a/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt index 51cc667b33..8c9174ca44 100644 --- a/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/printdatatags/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(printdatatags - GUI SOURCES tst_printdatatags.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:printdatatags.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:printdatatags.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt index cfe560ac17..7eef1bce09 100644 --- a/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt +++ b/tests/auto/testlib/selftests/printdatatags/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(printdatatags NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_printdatatags.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:printdatatags.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:printdatatags.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt index 60d5ee891b..161051cec4 100644 --- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(printdatatagswithglobaltags - GUI SOURCES tst_printdatatagswithglobaltags.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:printdatatagswithglobaltags.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:printdatatagswithglobaltags.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt index 56270f7f51..9baefbaabf 100644 --- a/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt +++ b/tests/auto/testlib/selftests/printdatatagswithglobaltags/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(printdatatagswithglobaltags NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_printdatatagswithglobaltags.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:printdatatagswithglobaltags.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:printdatatagswithglobaltags.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt index f0454960cc..2a33f2dc4d 100644 --- a/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/qexecstringlist/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(qexecstringlist - GUI SOURCES tst_qexecstringlist.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:qexecstringlist.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qexecstringlist.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt index da12ddd750..a4aac7f924 100644 --- a/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt +++ b/tests/auto/testlib/selftests/qexecstringlist/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(qexecstringlist NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_qexecstringlist.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:qexecstringlist.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:qexecstringlist.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt index f55e6889b2..e5989ba69e 100644 --- a/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/signaldumper/.prev_CMakeLists.txt @@ -8,17 +8,9 @@ add_qt_executable(signaldumper GUI SOURCES tst_signaldumper.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:signaldumper.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:signaldumper.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt index 5381310265..0376ffacd1 100644 --- a/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt +++ b/tests/auto/testlib/selftests/signaldumper/CMakeLists.txt @@ -10,17 +10,9 @@ add_qt_executable(signaldumper GUI SOURCES tst_signaldumper.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:signaldumper.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:signaldumper.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt index df5215a557..ebe7d6e299 100644 --- a/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/silent/.prev_CMakeLists.txt @@ -8,17 +8,9 @@ add_qt_executable(silent GUI SOURCES tst_silent.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:silent.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:silent.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/silent/CMakeLists.txt b/tests/auto/testlib/selftests/silent/CMakeLists.txt index 5fc3190c5b..23916b81e0 100644 --- a/tests/auto/testlib/selftests/silent/CMakeLists.txt +++ b/tests/auto/testlib/selftests/silent/CMakeLists.txt @@ -10,17 +10,9 @@ add_qt_executable(silent GUI SOURCES tst_silent.cpp - LIBRARIES - Qt::TestPrivate PUBLIC_LIBRARIES - Qt::Test + Qt::TestPrivate ) -#### Keys ignored in scope 1:.:.:silent.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:silent.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt index 176e0be6c0..60d4984df8 100644 --- a/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/singleskip/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(singleskip - GUI SOURCES tst_singleskip.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:singleskip.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:singleskip.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/singleskip/CMakeLists.txt b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt index 015698758d..c3e70ddf72 100644 --- a/tests/auto/testlib/selftests/singleskip/CMakeLists.txt +++ b/tests/auto/testlib/selftests/singleskip/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(singleskip NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_singleskip.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:singleskip.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:singleskip.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt index 7fd34cfe39..2eaac745a8 100644 --- a/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/skip/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(skip - GUI SOURCES tst_skip.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:skip.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:skip.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/skip/CMakeLists.txt b/tests/auto/testlib/selftests/skip/CMakeLists.txt index 4597729529..f282c3e6a3 100644 --- a/tests/auto/testlib/selftests/skip/CMakeLists.txt +++ b/tests/auto/testlib/selftests/skip/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(skip NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_skip.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:skip.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:skip.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt index c79684c20a..77673004b2 100644 --- a/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipcleanup/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(skipcleanup - GUI SOURCES tst_skipcleanup.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:skipcleanup.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:skipcleanup.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt index 51b077e09e..09fef0967b 100644 --- a/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipcleanup/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(skipcleanup NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_skipcleanup.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:skipcleanup.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:skipcleanup.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt index a08fb6fb27..4a36d0fa1c 100644 --- a/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipinit/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(skipinit - GUI SOURCES tst_skipinit.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:skipinit.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:skipinit.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/skipinit/CMakeLists.txt b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt index 35439d8ae8..47c437d3b7 100644 --- a/tests/auto/testlib/selftests/skipinit/CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipinit/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(skipinit NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_skipinit.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:skipinit.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:skipinit.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt index 9ee6245368..7f7773c87c 100644 --- a/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipinitdata/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(skipinitdata - GUI SOURCES tst_skipinitdata.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:skipinitdata.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:skipinitdata.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt index ff32667e94..edbf6c1389 100644 --- a/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt +++ b/tests/auto/testlib/selftests/skipinitdata/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(skipinitdata NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_skipinitdata.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:skipinitdata.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:skipinitdata.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt index fa90735255..c176681068 100644 --- a/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/sleep/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(sleep - GUI SOURCES tst_sleep.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:sleep.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:sleep.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/sleep/CMakeLists.txt b/tests/auto/testlib/selftests/sleep/CMakeLists.txt index f5f585a961..ea85b03cc1 100644 --- a/tests/auto/testlib/selftests/sleep/CMakeLists.txt +++ b/tests/auto/testlib/selftests/sleep/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(sleep NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_sleep.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:sleep.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:sleep.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt index c51789cb96..ff5b402328 100644 --- a/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/strcmp/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(strcmp - GUI SOURCES tst_strcmp.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:strcmp.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:strcmp.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/strcmp/CMakeLists.txt b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt index 7660153592..70a6ccf33d 100644 --- a/tests/auto/testlib/selftests/strcmp/CMakeLists.txt +++ b/tests/auto/testlib/selftests/strcmp/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(strcmp NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_strcmp.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:strcmp.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:strcmp.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt index 1e321d7d99..dd4ad850c6 100644 --- a/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/subtest/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(subtest - GUI SOURCES tst_subtest.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:subtest.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:subtest.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/subtest/CMakeLists.txt b/tests/auto/testlib/selftests/subtest/CMakeLists.txt index 2193ab1745..c532f7f77c 100644 --- a/tests/auto/testlib/selftests/subtest/CMakeLists.txt +++ b/tests/auto/testlib/selftests/subtest/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(subtest NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_subtest.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:subtest.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:subtest.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt index e16d3eef61..14a5175693 100644 --- a/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/testlib/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(testlib - GUI SOURCES tst_testlib.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:testlib.pro:APPLE: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/testlib/CMakeLists.txt b/tests/auto/testlib/selftests/testlib/CMakeLists.txt index 8be09409c9..8f23f114bc 100644 --- a/tests/auto/testlib/selftests/testlib/CMakeLists.txt +++ b/tests/auto/testlib/selftests/testlib/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(testlib NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_testlib.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:testlib.pro:APPLE: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt index 5d16c68c79..7b6b107dff 100644 --- a/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/tuplediagnostics/.prev_CMakeLists.txt @@ -5,12 +5,8 @@ ##################################################################### add_qt_executable(tuplediagnostics - GUI SOURCES tst_tuplediagnostics.cpp PUBLIC_LIBRARIES Qt::Test ) - -#### Keys ignored in scope 1:.:.:tuplediagnostics.pro:<TRUE>: -# CONFIG = "-app_bundle" "-debug_and_release_target" diff --git a/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt index 880ee099d6..d43bcbfc07 100644 --- a/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt +++ b/tests/auto/testlib/selftests/tuplediagnostics/CMakeLists.txt @@ -7,12 +7,8 @@ add_qt_executable(tuplediagnostics NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_tuplediagnostics.cpp PUBLIC_LIBRARIES Qt::Test ) - -#### Keys ignored in scope 1:.:.:tuplediagnostics.pro:<TRUE>: -# CONFIG = "-app_bundle" "-debug_and_release_target" diff --git a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt index bdaed7dc45..9faa977236 100644 --- a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(verbose1 - GUI SOURCES ../counting/tst_counting.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:verbose1.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:verbose1.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt index 7b93c0c571..10f79d2d22 100644 --- a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(verbose1 NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES ../counting/tst_counting.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:verbose1.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:verbose1.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt index 0da6c883ec..7b43fc0085 100644 --- a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(verbose2 - GUI SOURCES ../counting/tst_counting.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:verbose2.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:verbose2.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt index 14d1319c3d..138f343178 100644 --- a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(verbose2 NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES ../counting/tst_counting.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:verbose2.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:verbose2.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt index fb28197adc..f4e20fcfc6 100644 --- a/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/.prev_CMakeLists.txt @@ -5,18 +5,12 @@ ##################################################################### add_qt_executable(verifyexceptionthrown - GUI + EXCEPTIONS SOURCES tst_verifyexceptionthrown.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:verifyexceptionthrown.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" "exceptions" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:verifyexceptionthrown.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt index 24dd224107..def296ed7b 100644 --- a/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt +++ b/tests/auto/testlib/selftests/verifyexceptionthrown/CMakeLists.txt @@ -8,18 +8,11 @@ add_qt_executable(verifyexceptionthrown EXCEPTIONS NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_verifyexceptionthrown.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:verifyexceptionthrown.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" "exceptions" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:verifyexceptionthrown.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt index 111ec1594d..11fb5098d6 100644 --- a/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/warnings/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(warnings - GUI SOURCES tst_warnings.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:warnings.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:warnings.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/warnings/CMakeLists.txt b/tests/auto/testlib/selftests/warnings/CMakeLists.txt index e61d35c6e1..32e3bfe68f 100644 --- a/tests/auto/testlib/selftests/warnings/CMakeLists.txt +++ b/tests/auto/testlib/selftests/warnings/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(warnings NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_warnings.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:warnings.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:warnings.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt index 8852d670a4..1ea502875e 100644 --- a/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/watchdog/.prev_CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(watchdog - GUI SOURCES tst_watchdog.cpp PUBLIC_LIBRARIES @@ -13,13 +12,9 @@ add_qt_executable(watchdog ) #### Keys ignored in scope 1:.:.:watchdog.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" # QT_TOOL_ENV = "checkenv" # checkenv.name = "QTEST_FUNCTION_TIMEOUT" # checkenv.value = "100" ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:watchdog.pro:APPLE: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt index c932676b1a..84236e2b5e 100644 --- a/tests/auto/testlib/selftests/watchdog/CMakeLists.txt +++ b/tests/auto/testlib/selftests/watchdog/CMakeLists.txt @@ -7,7 +7,6 @@ add_qt_executable(watchdog NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_watchdog.cpp PUBLIC_LIBRARIES @@ -15,13 +14,9 @@ add_qt_executable(watchdog ) #### Keys ignored in scope 1:.:.:watchdog.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" # QT_TOOL_ENV = "checkenv" # checkenv.name = "QTEST_FUNCTION_TIMEOUT" # checkenv.value = "100" ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:watchdog.pro:APPLE: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt index 73fbbc18df..6a55c59e00 100644 --- a/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/xunit/.prev_CMakeLists.txt @@ -5,18 +5,11 @@ ##################################################################### add_qt_executable(xunit - GUI SOURCES tst_xunit.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:xunit.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:xunit.pro:APPLE_OSX: -# CONFIG = "-app_bundle" diff --git a/tests/auto/testlib/selftests/xunit/CMakeLists.txt b/tests/auto/testlib/selftests/xunit/CMakeLists.txt index cbbcb52080..d47d479bdf 100644 --- a/tests/auto/testlib/selftests/xunit/CMakeLists.txt +++ b/tests/auto/testlib/selftests/xunit/CMakeLists.txt @@ -7,18 +7,11 @@ add_qt_executable(xunit NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case - GUI SOURCES tst_xunit.cpp PUBLIC_LIBRARIES Qt::Test ) -#### Keys ignored in scope 1:.:.:xunit.pro:<TRUE>: -# CONFIG = "-debug_and_release_target" - ## Scopes: ##################################################################### - -#### Keys ignored in scope 2:.:.:xunit.pro:APPLE_OSX: -# CONFIG = "-app_bundle" |