diff --git a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt index 62d517c27d2..9a0bbc189cf 100644 --- a/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/.prev_CMakeLists.txt @@ -11,7 +11,6 @@ add_qt_test(tst_qmetatype SOURCES tst_qmetatype.cpp DEFINES - -QT_NO_LINKED_LIST QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common diff --git a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt index 3c9bb97825b..9a0bbc189cf 100644 --- a/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qmetatype/CMakeLists.txt @@ -11,7 +11,6 @@ add_qt_test(tst_qmetatype SOURCES tst_qmetatype.cpp DEFINES - # -QT_NO_LINKED_LIST # special case remove until we fix this QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt index dc676d11fed..bdf2e2f461f 100644 --- a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt @@ -8,7 +8,6 @@ add_qt_test(tst_qvariant SOURCES tst_qvariant.cpp DEFINES - -QT_NO_LINKED_LIST QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common @@ -32,3 +31,8 @@ add_qt_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### + +extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion + DEFINES + QT_NO_DOUBLECONVERSION +) diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt index dff731cfc21..bdf2e2f461f 100644 --- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -8,7 +8,6 @@ add_qt_test(tst_qvariant SOURCES tst_qvariant.cpp DEFINES - # -QT_NO_LINKED_LIST # special case remove until we fix this QT_DISABLE_DEPRECATED_BEFORE=0 INCLUDE_DIRECTORIES ../../../other/qvariant_common @@ -32,3 +31,8 @@ add_qt_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### + +extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion + DEFINES + QT_NO_DOUBLECONVERSION +) diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt index b38b6223ed0..6f477bb541a 100644 --- a/tests/auto/corelib/serialization/json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/json/CMakeLists.txt @@ -34,3 +34,8 @@ if(ANDROID) ${json_resource_files} ) endif() + +extend_target(tst_json CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion + DEFINES + QT_NO_DOUBLECONVERSION +) diff --git a/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt index 1402aed9abc..a293f87155a 100644 --- a/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/.prev_CMakeLists.txt @@ -10,8 +10,6 @@ list(APPEND test_data "datastream.q42") add_qt_test(tst_qdatastream SOURCES tst_qdatastream.cpp - DEFINES - -QT_NO_LINKED_LIST PUBLIC_LIBRARIES Qt::Gui TESTDATA ${test_data} diff --git a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt index 2bb2e842e8e..a293f87155a 100644 --- a/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt +++ b/tests/auto/corelib/serialization/qdatastream/CMakeLists.txt @@ -10,8 +10,6 @@ list(APPEND test_data "datastream.q42") add_qt_test(tst_qdatastream SOURCES tst_qdatastream.cpp - DEFINES - # -QT_NO_LINKED_LIST # special case remove PUBLIC_LIBRARIES Qt::Gui TESTDATA ${test_data} diff --git a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt index 671eeef6656..6908bd678c3 100644 --- a/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt +++ b/tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qfuture Test: ##################################################################### -add_qt_test(tst_qfuture +qt_add_test(tst_qfuture SOURCES tst_qfuture.cpp DEFINES diff --git a/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt new file mode 100644 index 00000000000..30990c13879 --- /dev/null +++ b/tests/auto/gui/kernel/qclipboard/copier/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from copier.pro. + +##################################################################### +## copier Binary: +##################################################################### + +add_qt_executable(copier + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:copier.pro:WIN32: +# DESTDIR = "../copier" diff --git a/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt new file mode 100644 index 00000000000..2c90c1530f5 --- /dev/null +++ b/tests/auto/gui/kernel/qclipboard/paster/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from paster.pro. + +##################################################################### +## paster Binary: +##################################################################### + +add_qt_executable(paster + SOURCES + main.cpp + PUBLIC_LIBRARIES + Qt::Gui +) + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:paster.pro:WIN32: +# DESTDIR = "../paster" diff --git a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt index 6a1043c89f4..29cafad93fe 100644 --- a/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt +++ b/tests/auto/gui/text/qtextmarkdownimporter/CMakeLists.txt @@ -7,6 +7,8 @@ # Collect test data list(APPEND test_data "data/thematicBreaks.md") list(APPEND test_data "data/headingBulletsContinuations.md") +list(APPEND test_data "data/fuzz20450.md") +list(APPEND test_data "data/fuzz20580.md") add_qt_test(tst_qtextmarkdownimporter SOURCES diff --git a/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt new file mode 100644 index 00000000000..48759572de6 --- /dev/null +++ b/tests/auto/network/access/qnetworkreply/test/.prev_CMakeLists.txt @@ -0,0 +1,59 @@ +# Generated from test.pro. + +##################################################################### +## tst_qnetworkreply Test: +##################################################################### + +# Collect test data +list(APPEND test_data "../empty") +list(APPEND test_data "../rfc3252.txt") +list(APPEND test_data "../resource") +list(APPEND test_data "../bigfile") +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ../*.jpg) +list(APPEND test_data ${test_data_glob}) +list(APPEND test_data "../certs") +list(APPEND test_data "../index.html") +list(APPEND test_data "../smb-file.txt") + +add_qt_test(tst_qnetworkreply + SOURCES + ../../../../../shared/emulationdetector.h + ../tst_qnetworkreply.cpp + INCLUDE_DIRECTORIES + ../../../../../shared + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + TESTDATA ${test_data} +) + +# Resources: +set_source_files_properties("../resource" + PROPERTIES QT_RESOURCE_ALIAS "resource" +) +set(qnetworkreply_resource_files + "resource" +) + +add_qt_resource(tst_qnetworkreply "qnetworkreply" + PREFIX + "/" + BASE + ".." + FILES + ${qnetworkreply_resource_files} +) + + +#### Keys ignored in scope 1:.:.:test.pro:: +# QT_FOR_CONFIG = "gui-private" +# QT_TEST_SERVER_LIST = "vsftpd" "apache2" "ftp-proxy" "danted" "squid" +# testcase.timeout = "600" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:test.pro:NOT ANDROID AND NOT WINRT: +# TEST_HELPER_INSTALLS = "../echo/echo" diff --git a/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt new file mode 100644 index 00000000000..df05c5012b6 --- /dev/null +++ b/tests/auto/network/socket/qtcpserver/test/.prev_CMakeLists.txt @@ -0,0 +1,26 @@ +# Generated from test.pro. + +##################################################################### +## tst_qtcpserver Test: +##################################################################### + +add_qt_test(tst_qtcpserver + SOURCES + ../tst_qtcpserver.cpp + PUBLIC_LIBRARIES + Qt::Network +) + +#### Keys ignored in scope 1:.:.:test.pro:: +# MOC_DIR = "tmp" + +## Scopes: +##################################################################### + +extend_target(tst_qtcpserver CONDITION WIN32 + PUBLIC_LIBRARIES + ws2_32 +) + +#### Keys ignored in scope 6:.:.:test.pro:LINUX: +# QT_TEST_SERVER_LIST = "danted" "cyrus" "squid" "ftp-proxy" diff --git a/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt new file mode 100644 index 00000000000..f5ec5f50ce1 --- /dev/null +++ b/tests/auto/network/socket/qudpsocket/test/.prev_CMakeLists.txt @@ -0,0 +1,33 @@ +# Generated from test.pro. + +##################################################################### +## tst_qudpsocket Test: +##################################################################### + +add_qt_test(tst_qudpsocket + SOURCES + ../tst_qudpsocket.cpp + INCLUDE_DIRECTORIES + ../../../../../shared + PUBLIC_LIBRARIES + Qt::Network +) + +#### Keys ignored in scope 1:.:.:test.pro:: +# MOC_DIR = "tmp" +# testcase.timeout = "800" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 3:.:.:test.pro:(CMAKE_BUILD_TYPE STREQUAL Debug): +# DESTDIR = "../debug" + +#### Keys ignored in scope 4:.:.:test.pro:else: +# DESTDIR = "../release" + +#### Keys ignored in scope 5:.:.:test.pro:else: +# DESTDIR = "../" + +#### Keys ignored in scope 6:.:.:test.pro:LINUX: +# QT_TEST_SERVER_LIST = "danted" "echo" diff --git a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt index ce2187af0b9..6195be45ee1 100644 --- a/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater/.prev_CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from deleteLater.pro. ##################################################################### -## tst_deleteLater Binary: +## deleteLater Binary: ##################################################################### -add_qt_executable(tst_deleteLater +add_qt_executable(deleteLater SOURCES tst_deleteLater.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt index 78876a9dbbc..e0566e39148 100644 --- a/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater/CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from deleteLater.pro. ##################################################################### -## tst_deleteLater Binary: +## deleteLater Binary: ##################################################################### -add_qt_executable(tst_deleteLater +add_qt_executable(deleteLater NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt index 48be681cbd6..bd90a192ac7 100644 --- a/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater_noApp/.prev_CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from deleteLater_noApp.pro. ##################################################################### -## tst_deleteLater_noApp Binary: +## deleteLater_noApp Binary: ##################################################################### -add_qt_executable(tst_deleteLater_noApp +add_qt_executable(deleteLater_noApp SOURCES tst_deleteLater_noApp.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt index ddcd19e8e3e..11183e7a590 100644 --- a/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt +++ b/tests/auto/testlib/selftests/deleteLater_noApp/CMakeLists.txt @@ -1,10 +1,10 @@ # Generated from deleteLater_noApp.pro. ##################################################################### -## tst_deleteLater_noApp Binary: +## deleteLater_noApp Binary: ##################################################################### -add_qt_executable(tst_deleteLater_noApp +add_qt_executable(deleteLater_noApp NO_INSTALL # special case OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES diff --git a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt index 9faa9772368..2f432979081 100644 --- a/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose1/.prev_CMakeLists.txt @@ -7,6 +7,8 @@ add_qt_executable(verbose1 SOURCES ../counting/tst_counting.cpp + DEFINES + TESTLIB_VERBOSITY_ARG="-v1" PUBLIC_LIBRARIES Qt::Test ) diff --git a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt index 10f79d2d22d..f44887156f3 100644 --- a/tests/auto/testlib/selftests/verbose1/CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose1/CMakeLists.txt @@ -9,6 +9,8 @@ add_qt_executable(verbose1 OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES ../counting/tst_counting.cpp + DEFINES + TESTLIB_VERBOSITY_ARG="-v1" PUBLIC_LIBRARIES Qt::Test ) diff --git a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt index 7b43fc00852..d55948ee730 100644 --- a/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose2/.prev_CMakeLists.txt @@ -7,6 +7,8 @@ add_qt_executable(verbose2 SOURCES ../counting/tst_counting.cpp + DEFINES + TESTLIB_VERBOSITY_ARG="-v2" PUBLIC_LIBRARIES Qt::Test ) diff --git a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt index 138f3431789..85e495ee7dd 100644 --- a/tests/auto/testlib/selftests/verbose2/CMakeLists.txt +++ b/tests/auto/testlib/selftests/verbose2/CMakeLists.txt @@ -9,6 +9,8 @@ add_qt_executable(verbose2 OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case SOURCES ../counting/tst_counting.cpp + DEFINES + TESTLIB_VERBOSITY_ARG="-v2" PUBLIC_LIBRARIES Qt::Test ) diff --git a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt index 849dfea52a4..dc47e7d9d9f 100644 --- a/tests/auto/widgets/kernel/qwidget/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qwidget/CMakeLists.txt @@ -21,6 +21,7 @@ set(qwidget_resource_files "geometry-fullscreen.dat" "geometry-maximized.dat" "geometry.dat" + "hellotr_la.qm" ) add_qt_resource(tst_qwidget "qwidget" diff --git a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt index 8fac5c34979..e5398b4c1ec 100644 --- a/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/functional/GraphicsViewBenchmark/CMakeLists.txt @@ -364,4 +364,5 @@ add_qt_resource(tst_GraphicsViewBenchmark "GraphicsViewBenchmark3" extend_target(tst_GraphicsViewBenchmark CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL + Qt::OpenGLWidgets ) diff --git a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt index 02c0893cdeb..c07c8dec5d5 100644 --- a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt +++ b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt @@ -54,4 +54,5 @@ extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl ../diaglib/glinfo.cpp ../diaglib/glinfo.h PUBLIC_LIBRARIES Qt::OpenGL + Qt::OpenGLWidgets ) diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt index 8a7f5251981..8fa02ca6073 100644 --- a/tests/manual/foreignwindows/CMakeLists.txt +++ b/tests/manual/foreignwindows/CMakeLists.txt @@ -19,6 +19,7 @@ add_qt_manual_test(foreignwindows Qt::CorePrivate Qt::Gui Qt::GuiPrivate + Qt::OpenGL Qt::Widgets ) @@ -54,4 +55,5 @@ extend_target(foreignwindows CONDITION QT_FEATURE_opengl ../diaglib/glinfo.cpp ../diaglib/glinfo.h PUBLIC_LIBRARIES Qt::OpenGL + Qt::OpenGLWidgets ) diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt index c59910d363c..511f8b150f8 100644 --- a/tests/manual/lance/CMakeLists.txt +++ b/tests/manual/lance/CMakeLists.txt @@ -17,6 +17,7 @@ add_qt_manual_test(lance Qt::CorePrivate Qt::Gui Qt::GuiPrivate + Qt::OpenGLWidgets Qt::PrintSupport Qt::Widgets ) @@ -171,5 +172,4 @@ add_qt_resource(lance "images" extend_target(lance CONDITION TARGET Qt::OpenGL PUBLIC_LIBRARIES Qt::OpenGL - Qt::OpenGLWidgets )