diff options
author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-06-06 19:18:15 +0200 |
---|---|---|
committer | Craig Scott <craig.scott@qt.io> | 2021-06-07 18:34:43 +1000 |
commit | 790da1696930d30b6009b185dd2e247e22d4bf1b (patch) | |
tree | be0e2338bd5d9602d5c42508c785a0ce320d3319 /tests/auto/widgets | |
parent | c2f087800d247d41fe4fa4f737b5322ae22c9e9d (diff) |
Replace calls to obsolete cmake functions with modern alternative
Change-Id: I5674d887a73a6a693d1babc416470c9873491eb3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r-- | tests/auto/widgets/defaultsurfaceformat/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/widgets/favicon/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/widgets/loadsignals/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/widgets/offscreen/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/widgets/origins/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/auto/widgets/printing/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/widgets/proxypac/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/widgets/qwebenginescript/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/auto/widgets/qwebengineview/CMakeLists.txt | 2 |
9 files changed, 10 insertions, 10 deletions
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 |