From a3bd80c08cd046d892c666098093ec20fc9e1321 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 21 Sep 2020 19:30:19 +0200 Subject: CMake: Regenerate projects Clean up the state of the projects, before changing the internal CMake API function names. Task-number: QTBUG-86815 Change-Id: I90f1b21b8ae4439a4a293872c3bb728dab44a50d Reviewed-by: Joerg Bornemann --- tests/auto/.prev_CMakeLists.txt | 2 +- tests/auto/corelib/global/CMakeLists.txt | 2 +- .../auto/corelib/io/qstandardpaths/CMakeLists.txt | 3 - .../corelib/kernel/qvariant/.prev_CMakeLists.txt | 12 +++- tests/auto/corelib/kernel/qvariant/CMakeLists.txt | 2 +- .../auto/corelib/serialization/json/CMakeLists.txt | 3 +- tests/auto/gui/kernel/qmouseevent/qmouseevent.pro | 2 +- .../qabstractnetworkcache/.prev_CMakeLists.txt | 22 +++++++ .../access/qdecompresshelper/.prev_CMakeLists.txt | 1 + .../qhttpnetworkconnection/.prev_CMakeLists.txt | 21 ++++++ .../socket/qhttpsocketengine/.prev_CMakeLists.txt | 34 ++++++++++ .../qsocks5socketengine/.prev_CMakeLists.txt | 34 ++++++++++ .../network/ssl/qsslsocket/.prev_CMakeLists.txt | 38 +++++++++++ .../.prev_CMakeLists.txt | 35 ++++++++++ .../.prev_CMakeLists.txt | 34 ++++++++++ .../qgraphicsscene/.prev_CMakeLists.txt | 77 ++++++++++++++++++++++ .../graphicsview/qgraphicsscene/CMakeLists.txt | 2 +- .../widgets/widgets/qframe/.prev_CMakeLists.txt | 20 ++++++ tests/auto/widgets/widgets/qframe/CMakeLists.txt | 2 +- .../widgets/qopenglwidget/.prev_CMakeLists.txt | 18 +++++ .../widgets/widgets/qopenglwidget/CMakeLists.txt | 2 +- .../access/qdecompresshelper/.prev_CMakeLists.txt | 2 +- .../access/qdecompresshelper/CMakeLists.txt | 2 +- tests/manual/highdpi/dprgadget/CMakeLists.txt | 1 + tests/manual/highdpi/pixelgadget/CMakeLists.txt | 1 + tests/manual/touch/CMakeLists.txt | 1 + tests/manual/widgets/kernel/.prev_CMakeLists.txt | 1 + .../manual/widgets/kernel/setscreen/CMakeLists.txt | 1 - .../widgets/defaultUpMenuBar/CMakeLists.txt | 1 + 29 files changed, 358 insertions(+), 18 deletions(-) create mode 100644 tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt create mode 100644 tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt create mode 100644 tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt create mode 100644 tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt create mode 100644 tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt create mode 100644 tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt create mode 100644 tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt create mode 100644 tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt create mode 100644 tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt (limited to 'tests') diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt index 8a5e002e84..b0539214c8 100644 --- a/tests/auto/.prev_CMakeLists.txt +++ b/tests/auto/.prev_CMakeLists.txt @@ -14,7 +14,7 @@ endif() if(TARGET Qt::Concurrent) add_subdirectory(concurrent) endif() -if((((TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt) AND (system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1"))))) +if((((system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1")) AND (TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt)))) add_subdirectory(dbus) endif() if(TARGET Qt::Network) diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt index 4dab15eaab..2aa86c533e 100644 --- a/tests/auto/corelib/global/CMakeLists.txt +++ b/tests/auto/corelib/global/CMakeLists.txt @@ -6,12 +6,12 @@ add_subdirectory(qgetputenv) add_subdirectory(qglobal) add_subdirectory(qnumeric) add_subdirectory(qfloat16) +add_subdirectory(qkeycombination) add_subdirectory(qrandomgenerator) add_subdirectory(qlogging) add_subdirectory(qtendian) add_subdirectory(qglobalstatic) add_subdirectory(qhooks) -add_subdirectory(qkeycombination) if(WIN32) add_subdirectory(qwinregistry) endif() diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt index be03b3e986..74ec2cd855 100644 --- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt +++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt @@ -10,10 +10,7 @@ list(APPEND test_data "qstandardpaths.pro") qt_add_test(tst_qstandardpaths SOURCES - ../../../../shared/emulationdetector.h tst_qstandardpaths.cpp - INCLUDE_DIRECTORIES - ../../../../shared TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt index bdf2e2f461..9534e22368 100644 --- a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvariant Test: ##################################################################### -add_qt_test(tst_qvariant +qt_add_test(tst_qvariant SOURCES tst_qvariant.cpp DEFINES @@ -13,6 +13,7 @@ add_qt_test(tst_qvariant ../../../other/qvariant_common PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui ) # Resources: @@ -21,7 +22,7 @@ set(qvariant_resource_files "stream/qt5.0/" ) -add_qt_resource(tst_qvariant "qvariant" +qt_add_resource(tst_qvariant "qvariant" PREFIX "/" FILES @@ -32,7 +33,12 @@ add_qt_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### -extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_extend_target(tst_qvariant CONDITION MSVC + COMPILE_OPTIONS + /bigobj +) + +qt_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 7ac25bf3d5..9534e22368 100644 --- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -33,7 +33,7 @@ qt_add_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### -qt_extend_target(tst_qmetatype CONDITION MSVC +qt_extend_target(tst_qvariant CONDITION MSVC COMPILE_OPTIONS /bigobj ) diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt index 57cab16b3d..f2d0d9d54c 100644 --- a/tests/auto/corelib/serialization/json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/json/CMakeLists.txt @@ -15,13 +15,12 @@ qt_add_test(tst_json ##################################################################### #### Keys ignored in scope 2:.:.:json.pro:NOT ANDROID: -# TESTDATA = "bom.json" "test.json" "test.bjson" "test3.json" "test2.json" +# TESTDATA = "bom.json" "test.json" "test3.json" "test2.json" if(ANDROID) # Resources: set(json_resource_files "bom.json" - "test.bjson" "test.json" "test2.json" "test3.json" diff --git a/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro index f6d259e817..6deac78485 100644 --- a/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro +++ b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qmouseevent -QT += testlib gui_private +QT += testlib gui-private SOURCES += tst_qmouseevent.cpp diff --git a/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt b/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt new file mode 100644 index 0000000000..3196ccca59 --- /dev/null +++ b/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from qabstractnetworkcache.pro. + +##################################################################### +## tst_qabstractnetworkcache Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + tests/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qabstractnetworkcache + SOURCES + tst_qabstractnetworkcache.cpp + PUBLIC_LIBRARIES + Qt::Network + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qabstractnetworkcache.pro:: +# QT_TEST_SERVER_LIST = "apache2" diff --git a/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt b/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt index e8680993cb..ce8f55646c 100644 --- a/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt +++ b/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt @@ -9,6 +9,7 @@ qt_add_test(tst_qdecompresshelper gzip.rcc.cpp inflate.rcc.cpp tst_qdecompresshelper.cpp + zstandard.rcc.cpp DEFINES SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}" PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt new file mode 100644 index 0000000000..621e339c1a --- /dev/null +++ b/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from qhttpnetworkconnection.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qhttpnetworkconnection Test: +##################################################################### + +qt_add_test(tst_qhttpnetworkconnection + SOURCES + tst_qhttpnetworkconnection.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:qhttpnetworkconnection.pro:: +# QT_TEST_SERVER_LIST = "apache2" +# _REQUIREMENTS = "qtConfig(private_tests)" diff --git a/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt new file mode 100644 index 0000000000..8afcdc3376 --- /dev/null +++ b/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from qhttpsocketengine.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qhttpsocketengine Test: +##################################################################### + +qt_add_test(tst_qhttpsocketengine + SOURCES + tst_qhttpsocketengine.cpp + INCLUDE_DIRECTORIES + ${QT_SOURCE_TREE}/src/network + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:qhttpsocketengine.pro:: +# MOC_DIR = "tmp" +# _REQUIREMENTS = "qtConfig(private_tests)" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX: +# QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" + +qt_extend_target(tst_qhttpsocketengine CONDITION WIN32 + PUBLIC_LIBRARIES + ws2_32 +) diff --git a/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt new file mode 100644 index 0000000000..0b2430c81a --- /dev/null +++ b/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from qsocks5socketengine.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qsocks5socketengine Test: +##################################################################### + +qt_add_test(tst_qsocks5socketengine + SOURCES + tst_qsocks5socketengine.cpp + INCLUDE_DIRECTORIES + ${QT_SOURCE_TREE}/src/network + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:qsocks5socketengine.pro:: +# MOC_DIR = "tmp" +# _REQUIREMENTS = "qtConfig(private_tests)" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX: +# QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus" + +qt_extend_target(tst_qsocks5socketengine CONDITION WIN32 + PUBLIC_LIBRARIES + ws2_32 +) diff --git a/tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt new file mode 100644 index 0000000000..59ab6ff93a --- /dev/null +++ b/tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt @@ -0,0 +1,38 @@ +# Generated from qsslsocket.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qsslsocket Test: +##################################################################### + +# Collect test data +list(APPEND test_data "certs") + +qt_add_test(tst_qsslsocket + SOURCES + tst_qsslsocket.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qsslsocket.pro:: +# _REQUIREMENTS = "qtConfig(private_tests)" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 3:.:.:qsslsocket.pro:(CMAKE_BUILD_TYPE STREQUAL Debug): +# DESTDIR = "debug" + +#### Keys ignored in scope 4:.:.:qsslsocket.pro:else: +# DESTDIR = "release" + +#### Keys ignored in scope 5:.:.:qsslsocket.pro:LINUX: +# QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" "echo" diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt new file mode 100644 index 0000000000..9a1beaeb76 --- /dev/null +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt @@ -0,0 +1,35 @@ +# Generated from qsslsocket_onDemandCertificates_member.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qsslsocket_onDemandCertificates_member Test: +##################################################################### + +qt_add_test(tst_qsslsocket_onDemandCertificates_member + SOURCES + tst_qsslsocket_onDemandCertificates_member.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_member.pro:: +# _REQUIREMENTS = "qtConfig(private_tests)" +# testcase.timeout = "300" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 3:.:.:qsslsocket_onDemandCertificates_member.pro:(CMAKE_BUILD_TYPE STREQUAL Debug): +# DESTDIR = "debug" + +#### Keys ignored in scope 4:.:.:qsslsocket_onDemandCertificates_member.pro:else: +# DESTDIR = "release" + +#### Keys ignored in scope 5:.:.:qsslsocket_onDemandCertificates_member.pro:LINUX: +# QT_TEST_SERVER_LIST = "squid" "danted" diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f8d6735c20 --- /dev/null +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from qsslsocket_onDemandCertificates_static.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qsslsocket_onDemandCertificates_static Test: +##################################################################### + +qt_add_test(tst_qsslsocket_onDemandCertificates_static + SOURCES + tst_qsslsocket_onDemandCertificates_static.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_static.pro:: +# _REQUIREMENTS = "qtConfig(private_tests)" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 3:.:.:qsslsocket_onDemandCertificates_static.pro:(CMAKE_BUILD_TYPE STREQUAL Debug): +# DESTDIR = "debug" + +#### Keys ignored in scope 4:.:.:qsslsocket_onDemandCertificates_static.pro:else: +# DESTDIR = "release" + +#### Keys ignored in scope 5:.:.:qsslsocket_onDemandCertificates_static.pro:LINUX: +# QT_TEST_SERVER_LIST = "squid" "danted" diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt new file mode 100644 index 0000000000..3208cf2b36 --- /dev/null +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt @@ -0,0 +1,77 @@ +# Generated from qgraphicsscene.pro. + +##################################################################### +## tst_qgraphicsscene Test: +##################################################################### + +qt_add_test(tst_qgraphicsscene + SOURCES + tst_qgraphicsscene.cpp + DEFINES + QT_NO_CAST_TO_ASCII + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets + Qt::WidgetsPrivate +) + +# Resources: +set(images_resource_files + "Ash_European.jpg" +) + +qt_add_resource(tst_qgraphicsscene "images" + PREFIX + "/" + FILES + ${images_resource_files} +) +set(testdata_resource_files + "testData/render/all-all-45-deg-left.png" + "testData/render/all-all-45-deg-right.png" + "testData/render/all-all-scale-2x.png" + "testData/render/all-all-translate-0-50.png" + "testData/render/all-all-translate-50-0.png" + "testData/render/all-all-untransformed-clip-ellipse.png" + "testData/render/all-all-untransformed-clip-rect.png" + "testData/render/all-all-untransformed.png" + "testData/render/all-bottomleft-untransformed.png" + "testData/render/all-bottomright-untransformed.png" + "testData/render/all-topleft-untransformed.png" + "testData/render/all-topright-untransformed.png" + "testData/render/bottom-bottomright-untransformed.png" + "testData/render/bottom-topleft-untransformed.png" + "testData/render/bottomleft-all-untransformed.png" + "testData/render/bottomleft-topleft-untransformed.png" + "testData/render/bottomright-all-untransformed.png" + "testData/render/bottomright-topleft-untransformed.png" + "testData/render/left-bottomright-untransformed.png" + "testData/render/left-topleft-untransformed.png" + "testData/render/right-bottomright-untransformed.png" + "testData/render/right-topleft-untransformed.png" + "testData/render/top-bottomright-untransformed.png" + "testData/render/top-topleft-untransformed.png" + "testData/render/topleft-all-untransformed.png" + "testData/render/topleft-topleft-untransformed.png" + "testData/render/topright-all-untransformed.png" + "testData/render/topright-topleft-untransformed.png" +) + +qt_add_resource(tst_qgraphicsscene "testdata" + PREFIX + "/" + FILES + ${testdata_resource_files} +) + + +## Scopes: +##################################################################### + +qt_extend_target(tst_qgraphicsscene CONDITION WIN32 + PUBLIC_LIBRARIES + user32 +) diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt index f0865f6a37..b17d328446 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_add_test(tst_qgraphicsscene - LOWDPI + LOWDPI # special case SOURCES tst_qgraphicsscene.cpp DEFINES diff --git a/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt new file mode 100644 index 0000000000..89f91d1967 --- /dev/null +++ b/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qframe.pro. + +##################################################################### +## tst_qframe Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + images/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qframe + SOURCES + tst_qframe.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + TESTDATA ${test_data} +) diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt index ac53d07fbd..be08a9b797 100644 --- a/tests/auto/widgets/widgets/qframe/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt @@ -11,7 +11,7 @@ file(GLOB_RECURSE test_data_glob list(APPEND test_data ${test_data_glob}) qt_add_test(tst_qframe - LOWDPI + LOWDPI # special case SOURCES tst_qframe.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt new file mode 100644 index 0000000000..d1af2e811c --- /dev/null +++ b/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qopenglwidget.pro. + +##################################################################### +## tst_qopenglwidget Test: +##################################################################### + +qt_add_test(tst_qopenglwidget + SOURCES + tst_qopenglwidget.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::OpenGL + Qt::OpenGLPrivate + Qt::OpenGLWidgets + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 062a468c6c..036f3316d9 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_add_test(tst_qopenglwidget - LOWDPI + LOWDPI # special case SOURCES tst_qopenglwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt b/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt index cec7aad7b2..6ac77db67d 100644 --- a/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt +++ b/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qdecompresshelper Binary: ##################################################################### -qt_add_executable(qdecompresshelper +qt_add_benchmark(qdecompresshelper SOURCES main.cpp DEFINES diff --git a/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt b/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt index af7676b561..e8c7493250 100644 --- a/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt +++ b/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## qdecompresshelper Binary: ##################################################################### -qt_add_executable(qdecompresshelper +qt_add_benchmark(qdecompresshelper SOURCES main.cpp DEFINES diff --git a/tests/manual/highdpi/dprgadget/CMakeLists.txt b/tests/manual/highdpi/dprgadget/CMakeLists.txt index 1afe59f4a5..0852adbe16 100644 --- a/tests/manual/highdpi/dprgadget/CMakeLists.txt +++ b/tests/manual/highdpi/dprgadget/CMakeLists.txt @@ -1,3 +1,4 @@ +# special case skip regeneration cmake_minimum_required(VERSION 3.14) project(dprgadget LANGUAGES CXX) set(CMAKE_AUTOMOC ON) diff --git a/tests/manual/highdpi/pixelgadget/CMakeLists.txt b/tests/manual/highdpi/pixelgadget/CMakeLists.txt index e463b36441..1bad33bc24 100644 --- a/tests/manual/highdpi/pixelgadget/CMakeLists.txt +++ b/tests/manual/highdpi/pixelgadget/CMakeLists.txt @@ -1,3 +1,4 @@ +# special case skip regeneration cmake_minimum_required(VERSION 3.14) project(pixelgadget LANGUAGES CXX) set(CMAKE_AUTOMOC ON) diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt index 571e2bbcec..1545095efa 100644 --- a/tests/manual/touch/CMakeLists.txt +++ b/tests/manual/touch/CMakeLists.txt @@ -9,6 +9,7 @@ qt_add_manual_test(touch main.cpp PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/widgets/kernel/.prev_CMakeLists.txt b/tests/manual/widgets/kernel/.prev_CMakeLists.txt index 0c03aec319..51ee0b63c6 100644 --- a/tests/manual/widgets/kernel/.prev_CMakeLists.txt +++ b/tests/manual/widgets/kernel/.prev_CMakeLists.txt @@ -3,3 +3,4 @@ add_subdirectory(qtooltip) add_subdirectory(sizeonhide) add_subdirectory(layoutreplace) +add_subdirectory(setscreen) diff --git a/tests/manual/widgets/kernel/setscreen/CMakeLists.txt b/tests/manual/widgets/kernel/setscreen/CMakeLists.txt index cf31341d7c..610a748830 100644 --- a/tests/manual/widgets/kernel/setscreen/CMakeLists.txt +++ b/tests/manual/widgets/kernel/setscreen/CMakeLists.txt @@ -9,7 +9,6 @@ qt_add_manual_test(setscreen SOURCES main.cpp PUBLIC_LIBRARIES - Qt::CorePrivate Qt::Gui Qt::Widgets ) diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt index 4437ce2fa9..1327ea39ef 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt @@ -9,6 +9,7 @@ qt_add_manual_test(defaultUpMenuBar SOURCES main.cpp PUBLIC_LIBRARIES + Qt::Gui Qt::GuiPrivate Qt::Widgets ) -- cgit v1.2.3