From 790da1696930d30b6009b185dd2e247e22d4bf1b Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Sun, 6 Jun 2021 19:18:15 +0200 Subject: Replace calls to obsolete cmake functions with modern alternative Change-Id: I5674d887a73a6a693d1babc416470c9873491eb3 Reviewed-by: Fabian Kosmale --- tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt | 2 +- tests/auto/core/qwebenginecookiestore/CMakeLists.txt | 2 +- tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt | 2 +- tests/auto/quick/certificateerror/CMakeLists.txt | 2 +- tests/auto/quick/dialogs/CMakeLists.txt | 2 +- tests/auto/quick/qtbug-70248/CMakeLists.txt | 2 +- tests/auto/widgets/defaultsurfaceformat/CMakeLists.txt | 2 +- tests/auto/widgets/favicon/CMakeLists.txt | 2 +- tests/auto/widgets/loadsignals/CMakeLists.txt | 2 +- tests/auto/widgets/offscreen/CMakeLists.txt | 2 +- tests/auto/widgets/origins/CMakeLists.txt | 4 ++-- tests/auto/widgets/printing/CMakeLists.txt | 2 +- tests/auto/widgets/proxypac/CMakeLists.txt | 2 +- tests/auto/widgets/qwebenginescript/CMakeLists.txt | 2 +- tests/auto/widgets/qwebengineview/CMakeLists.txt | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt index 18bba2e26..fa2d5e538 100644 --- a/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt +++ b/tests/auto/core/qwebengineclientcertificatestore/CMakeLists.txt @@ -12,7 +12,7 @@ set(tst_qwebengineclientcertificatestore_resource_files "resources/privatekey1.key" ) -qt_add_resource(tst_qwebengineclientcertificatestore "tst_qwebengineclientcertificatestore" +qt_internal_add_resource(tst_qwebengineclientcertificatestore "tst_qwebengineclientcertificatestore" PREFIX "/" FILES diff --git a/tests/auto/core/qwebenginecookiestore/CMakeLists.txt b/tests/auto/core/qwebenginecookiestore/CMakeLists.txt index 078259ccf..6125b4f12 100644 --- a/tests/auto/core/qwebenginecookiestore/CMakeLists.txt +++ b/tests/auto/core/qwebenginecookiestore/CMakeLists.txt @@ -15,7 +15,7 @@ set(tst_qwebenginecookiestore_resource_files "resources/index.html" ) -qt_add_resource(tst_qwebenginecookiestore "tst_qwebenginecookiestore" +qt_internal_add_resource(tst_qwebenginecookiestore "tst_qwebenginecookiestore" PREFIX "/" FILES diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt b/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt index fa6de9ef5..96a06c1b9 100644 --- a/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt +++ b/tests/auto/core/qwebengineurlrequestinterceptor/CMakeLists.txt @@ -33,7 +33,7 @@ set(tst_qwebengineurlrequestinterceptor_resource_files "resources/sw.js" ) -qt_add_resource(tst_qwebengineurlrequestinterceptor "tst_qwebengineurlrequestinterceptor" +qt_internal_add_resource(tst_qwebengineurlrequestinterceptor "tst_qwebengineurlrequestinterceptor" PREFIX "/" FILES diff --git a/tests/auto/quick/certificateerror/CMakeLists.txt b/tests/auto/quick/certificateerror/CMakeLists.txt index 4e19c0684..df40edd86 100644 --- a/tests/auto/quick/certificateerror/CMakeLists.txt +++ b/tests/auto/quick/certificateerror/CMakeLists.txt @@ -18,7 +18,7 @@ set(certificateerror_resource_files "WebView.qml" ) -qt_add_resource(tst_certificateerror_quick "certificateerror" +qt_internal_add_resource(tst_certificateerror_quick "certificateerror" PREFIX "/" FILES diff --git a/tests/auto/quick/dialogs/CMakeLists.txt b/tests/auto/quick/dialogs/CMakeLists.txt index b1fbfe3a3..b7f088f0d 100644 --- a/tests/auto/quick/dialogs/CMakeLists.txt +++ b/tests/auto/quick/dialogs/CMakeLists.txt @@ -17,7 +17,7 @@ set(dialogs_resource_files "index.html" ) -qt_add_resource(tst_dialogs "dialogs" +qt_internal_add_resource(tst_dialogs "dialogs" PREFIX "/" FILES diff --git a/tests/auto/quick/qtbug-70248/CMakeLists.txt b/tests/auto/quick/qtbug-70248/CMakeLists.txt index cc6f120b0..b1df50211 100644 --- a/tests/auto/quick/qtbug-70248/CMakeLists.txt +++ b/tests/auto/quick/qtbug-70248/CMakeLists.txt @@ -9,7 +9,7 @@ set(test_resource_files "test.qml" ) -qt_add_resource(tst_qtbug-70248 "test" +qt_internal_add_resource(tst_qtbug-70248 "test" PREFIX "/" FILES diff --git a/tests/auto/widgets/defaultsurfaceformat/CMakeLists.txt b/tests/auto/widgets/defaultsurfaceformat/CMakeLists.txt index 871c92350..6dd05f58f 100644 --- a/tests/auto/widgets/defaultsurfaceformat/CMakeLists.txt +++ b/tests/auto/widgets/defaultsurfaceformat/CMakeLists.txt @@ -12,7 +12,7 @@ set(tst_defaultsurfaceformat_resource_files "resources/index.html" ) -qt_add_resource(tst_defaultsurfaceformat "tst_defaultsurfaceformat" +qt_internal_add_resource(tst_defaultsurfaceformat "tst_defaultsurfaceformat" PREFIX "/" FILES diff --git a/tests/auto/widgets/favicon/CMakeLists.txt b/tests/auto/widgets/favicon/CMakeLists.txt index 64c4efc91..3a2f6f255 100644 --- a/tests/auto/widgets/favicon/CMakeLists.txt +++ b/tests/auto/widgets/favicon/CMakeLists.txt @@ -21,7 +21,7 @@ set(tst_favicon_resource_files "resources/test1.html" ) -qt_add_resource(tst_favicon "tst_favicon" +qt_internal_add_resource(tst_favicon "tst_favicon" PREFIX "/" FILES diff --git a/tests/auto/widgets/loadsignals/CMakeLists.txt b/tests/auto/widgets/loadsignals/CMakeLists.txt index f648cf6d3..5de957148 100644 --- a/tests/auto/widgets/loadsignals/CMakeLists.txt +++ b/tests/auto/widgets/loadsignals/CMakeLists.txt @@ -52,7 +52,7 @@ set(tst_loadsignals_resource_files "${sharedData}/loadprogress/page8.html" ) -qt_add_resource(tst_loadsignals "tst_loadsignals" +qt_internal_add_resource(tst_loadsignals "tst_loadsignals" PREFIX "/resources" FILES diff --git a/tests/auto/widgets/offscreen/CMakeLists.txt b/tests/auto/widgets/offscreen/CMakeLists.txt index 1ba5a1e6a..d51459a3e 100644 --- a/tests/auto/widgets/offscreen/CMakeLists.txt +++ b/tests/auto/widgets/offscreen/CMakeLists.txt @@ -13,7 +13,7 @@ set_tests_properties(tst_offscreen PROPERTIES ENVIRONMENT QT_QPA_PLATFORM=offscreen ) -qt_add_resource(tst_offscreen "tst_offscreen" +qt_internal_add_resource(tst_offscreen "tst_offscreen" PREFIX "/" FILES diff --git a/tests/auto/widgets/origins/CMakeLists.txt b/tests/auto/widgets/origins/CMakeLists.txt index 5ba017052..ca7a6a249 100644 --- a/tests/auto/widgets/origins/CMakeLists.txt +++ b/tests/auto/widgets/origins/CMakeLists.txt @@ -30,14 +30,14 @@ set(tst_origins_resource_files "resources/websocket.html" ) -qt_add_resource(tst_origins "tst_origins" +qt_internal_add_resource(tst_origins "tst_origins" PREFIX "/" FILES ${tst_origins_resource_files} ) -qt_extend_target(tst_origins CONDITION QT_FEATURE_webengine_webchannel AND TARGET Qt::WebSockets +qt_internal_extend_target(tst_origins CONDITION QT_FEATURE_webengine_webchannel AND TARGET Qt::WebSockets DEFINES WEBSOCKETS LIBRARIES diff --git a/tests/auto/widgets/printing/CMakeLists.txt b/tests/auto/widgets/printing/CMakeLists.txt index 4c06a1b38..e61b8cc89 100644 --- a/tests/auto/widgets/printing/CMakeLists.txt +++ b/tests/auto/widgets/printing/CMakeLists.txt @@ -28,7 +28,7 @@ set(tst_printing_resource_files "resources/basic_printing_page.html" ) -qt_add_resource(tst_printing "tst_printing" +qt_internal_add_resource(tst_printing "tst_printing" PREFIX "/" FILES ${tst_printing_resource_files} ) diff --git a/tests/auto/widgets/proxypac/CMakeLists.txt b/tests/auto/widgets/proxypac/CMakeLists.txt index 6a20bc95a..084e55f81 100644 --- a/tests/auto/widgets/proxypac/CMakeLists.txt +++ b/tests/auto/widgets/proxypac/CMakeLists.txt @@ -39,7 +39,7 @@ set_tests_properties(tst_proxypac_qrc PROPERTIES ENVIRONMENT QTWEBENGINE_CHROMIUM_FLAGS=${qrcEnvArg} ) -qt_add_resource(tst_proxypac_qrc "proxypac" +qt_internal_add_resource(tst_proxypac_qrc "proxypac" PREFIX "/" FILES diff --git a/tests/auto/widgets/qwebenginescript/CMakeLists.txt b/tests/auto/widgets/qwebenginescript/CMakeLists.txt index 2e93894d9..6e768cf90 100644 --- a/tests/auto/widgets/qwebenginescript/CMakeLists.txt +++ b/tests/auto/widgets/qwebenginescript/CMakeLists.txt @@ -18,7 +18,7 @@ set(tst_qwebenginescript_resource_files "resources/webChannelWithBadString.html" ) -qt_add_resource(tst_qwebenginescript "tst_qwebenginescript" +qt_internal_add_resource(tst_qwebenginescript "tst_qwebenginescript" PREFIX "/" FILES diff --git a/tests/auto/widgets/qwebengineview/CMakeLists.txt b/tests/auto/widgets/qwebengineview/CMakeLists.txt index 0f4fe9327..ac803df41 100644 --- a/tests/auto/widgets/qwebengineview/CMakeLists.txt +++ b/tests/auto/widgets/qwebengineview/CMakeLists.txt @@ -21,7 +21,7 @@ set(tst_qwebengineview_resource_files "resources/scrolltest_page.html" ) -qt_add_resource(tst_qwebengineview "tst_qwebengineview" +qt_internal_add_resource(tst_qwebengineview "tst_qwebengineview" PREFIX "/" FILES -- cgit v1.2.3