From 2d0d936aabe6421867060f8d764041bb57aae51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 8 Dec 2021 15:59:33 +0100 Subject: [PATCH] CMake: Prefer unversioned commands Change-Id: Ib32700ab82cf6b271c49e25d12fbad8c9c6bc1d1 Reviewed-by: Alexandru Croitor (cherry picked from commit 28a9d116bba00fde5aaa214bb7c929efc66af971) Reviewed-by: Qt Cherry-pick Bot --- .../bindableproperties/bindablesubscription/CMakeLists.txt | 2 +- .../corelib/bindableproperties/subscription/CMakeLists.txt | 2 +- examples/corelib/platform/androidnotifier/CMakeLists.txt | 2 +- examples/dbus/chat/CMakeLists.txt | 4 ++-- examples/dbus/remotecontrolledcar/car/CMakeLists.txt | 2 +- examples/dbus/remotecontrolledcar/controller/CMakeLists.txt | 2 +- examples/embedded/flightinfo/CMakeLists.txt | 2 +- examples/embedded/raycasting/CMakeLists.txt | 2 +- examples/embedded/styleexample/CMakeLists.txt | 2 +- examples/network/securesocketclient/CMakeLists.txt | 2 +- examples/network/torrent/CMakeLists.txt | 2 +- examples/opengl/computegles31/CMakeLists.txt | 2 +- examples/opengl/hellogles3/CMakeLists.txt | 2 +- examples/opengl/qopenglwindow/CMakeLists.txt | 2 +- examples/sql/books/CMakeLists.txt | 2 +- examples/sql/drilldown/CMakeLists.txt | 2 +- examples/sql/masterdetail/CMakeLists.txt | 2 +- examples/vulkan/hellovulkantexture/CMakeLists.txt | 2 +- examples/vulkan/hellovulkantriangle/CMakeLists.txt | 2 +- examples/vulkan/hellovulkanwidget/CMakeLists.txt | 2 +- examples/widgets/animation/easing/CMakeLists.txt | 2 +- examples/widgets/desktop/systray/CMakeLists.txt | 2 +- examples/widgets/dialogs/classwizard/CMakeLists.txt | 2 +- examples/widgets/dialogs/licensewizard/CMakeLists.txt | 2 +- examples/widgets/draganddrop/draggableicons/CMakeLists.txt | 2 +- examples/widgets/draganddrop/draggabletext/CMakeLists.txt | 2 +- examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt | 2 +- examples/widgets/draganddrop/puzzle/CMakeLists.txt | 2 +- examples/widgets/effects/blurpicker/CMakeLists.txt | 2 +- examples/widgets/effects/fademessage/CMakeLists.txt | 2 +- .../widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt | 2 +- examples/widgets/graphicsview/chip/CMakeLists.txt | 2 +- examples/widgets/graphicsview/collidingmice/CMakeLists.txt | 2 +- examples/widgets/graphicsview/diagramscene/CMakeLists.txt | 2 +- examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt | 2 +- examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt | 2 +- .../widgets/graphicsview/weatheranchorlayout/CMakeLists.txt | 2 +- examples/widgets/itemviews/chart/CMakeLists.txt | 2 +- .../widgets/itemviews/customsortfiltermodel/CMakeLists.txt | 2 +- examples/widgets/itemviews/editabletreemodel/CMakeLists.txt | 2 +- examples/widgets/itemviews/frozencolumn/CMakeLists.txt | 2 +- examples/widgets/itemviews/interview/CMakeLists.txt | 2 +- examples/widgets/itemviews/pixelator/CMakeLists.txt | 2 +- examples/widgets/itemviews/puzzle/CMakeLists.txt | 2 +- examples/widgets/itemviews/simpletreemodel/CMakeLists.txt | 2 +- examples/widgets/itemviews/spreadsheet/CMakeLists.txt | 2 +- examples/widgets/mainwindows/application/CMakeLists.txt | 2 +- examples/widgets/mainwindows/dockwidgets/CMakeLists.txt | 2 +- examples/widgets/mainwindows/mainwindow/CMakeLists.txt | 2 +- examples/widgets/mainwindows/mdi/CMakeLists.txt | 2 +- examples/widgets/mainwindows/sdi/CMakeLists.txt | 2 +- examples/widgets/painting/affine/CMakeLists.txt | 4 ++-- examples/widgets/painting/basicdrawing/CMakeLists.txt | 2 +- examples/widgets/painting/composition/CMakeLists.txt | 4 ++-- examples/widgets/painting/deform/CMakeLists.txt | 4 ++-- examples/widgets/painting/gradients/CMakeLists.txt | 4 ++-- examples/widgets/painting/imagecomposition/CMakeLists.txt | 2 +- examples/widgets/painting/pathstroke/CMakeLists.txt | 4 ++-- examples/widgets/richtext/textedit/CMakeLists.txt | 2 +- examples/widgets/tools/completer/CMakeLists.txt | 2 +- examples/widgets/tools/customcompleter/CMakeLists.txt | 2 +- examples/widgets/tools/i18n/CMakeLists.txt | 2 +- examples/widgets/tools/regularexpression/CMakeLists.txt | 2 +- examples/widgets/tools/treemodelcompleter/CMakeLists.txt | 2 +- examples/widgets/tools/undo/CMakeLists.txt | 2 +- examples/widgets/tools/undoframework/CMakeLists.txt | 2 +- examples/widgets/touch/pinchzoom/CMakeLists.txt | 2 +- examples/widgets/tutorials/notepad/CMakeLists.txt | 2 +- examples/widgets/widgets/styles/CMakeLists.txt | 2 +- examples/widgets/widgets/stylesheet/CMakeLists.txt | 2 +- examples/widgets/widgets/tablet/CMakeLists.txt | 2 +- examples/widgets/widgets/tooltips/CMakeLists.txt | 2 +- examples/widgets/widgets/validators/CMakeLists.txt | 2 +- examples/xml/htmlinfo/CMakeLists.txt | 2 +- 74 files changed, 80 insertions(+), 80 deletions(-) diff --git a/examples/corelib/bindableproperties/bindablesubscription/CMakeLists.txt b/examples/corelib/bindableproperties/bindablesubscription/CMakeLists.txt index 3662a65691f..67878585387 100644 --- a/examples/corelib/bindableproperties/bindablesubscription/CMakeLists.txt +++ b/examples/corelib/bindableproperties/bindablesubscription/CMakeLists.txt @@ -35,7 +35,7 @@ set(countries_resource_files "../shared/norway.png" ) -qt6_add_resources(bindablesubscription "countries" +qt_add_resources(bindablesubscription "countries" PREFIX "/" BASE diff --git a/examples/corelib/bindableproperties/subscription/CMakeLists.txt b/examples/corelib/bindableproperties/subscription/CMakeLists.txt index d12ea295c6c..841f535daf9 100644 --- a/examples/corelib/bindableproperties/subscription/CMakeLists.txt +++ b/examples/corelib/bindableproperties/subscription/CMakeLists.txt @@ -35,7 +35,7 @@ set(countries_resource_files "../shared/norway.png" ) -qt6_add_resources(subscription "countries" +qt_add_resources(subscription "countries" PREFIX "/" BASE diff --git a/examples/corelib/platform/androidnotifier/CMakeLists.txt b/examples/corelib/platform/androidnotifier/CMakeLists.txt index 8f42a20dd5e..b042a40a724 100644 --- a/examples/corelib/platform/androidnotifier/CMakeLists.txt +++ b/examples/corelib/platform/androidnotifier/CMakeLists.txt @@ -37,7 +37,7 @@ if(ANDROID) "images/sad.png" ) - qt6_add_resources(androidnotifier "main" + qt_add_resources(androidnotifier "main" PREFIX "/" FILES diff --git a/examples/dbus/chat/CMakeLists.txt b/examples/dbus/chat/CMakeLists.txt index 821d38968f6..e5ef5956f63 100644 --- a/examples/dbus/chat/CMakeLists.txt +++ b/examples/dbus/chat/CMakeLists.txt @@ -19,11 +19,11 @@ find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Widgets) # special case begin set(chat_SRCS) -qt6_add_dbus_interface(chat_SRCS +qt_add_dbus_interface(chat_SRCS org.example.chat.xml chat_interface ) -qt6_add_dbus_adaptor(chat_SRCS +qt_add_dbus_adaptor(chat_SRCS org.example.chat.xml qobject.h QObject diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt index 77dc4dd4bad..fa7a0a4b09f 100644 --- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt @@ -19,7 +19,7 @@ find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Widgets) # special case begin set(car_SRCS) -qt6_add_dbus_adaptor(car_SRCS +qt_add_dbus_adaptor(car_SRCS car.xml qobject.h "" # empty parent_class value on purpose to not pass -l flag diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt index 60e5ef5e08c..09057f1cdab 100644 --- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt @@ -19,7 +19,7 @@ find_package(Qt6 REQUIRED COMPONENTS Core DBus Gui Widgets) # special case begin set(controller_SRCS) -qt6_add_dbus_interface(controller_SRCS +qt_add_dbus_interface(controller_SRCS car.xml car_interface ) diff --git a/examples/embedded/flightinfo/CMakeLists.txt b/examples/embedded/flightinfo/CMakeLists.txt index bc2b9452791..5eb66bd0b14 100644 --- a/examples/embedded/flightinfo/CMakeLists.txt +++ b/examples/embedded/flightinfo/CMakeLists.txt @@ -38,7 +38,7 @@ set(flightinfo_resource_files "aircraft.png" ) -qt6_add_resources(flightinfo "flightinfo" +qt_add_resources(flightinfo "flightinfo" PREFIX "/" FILES diff --git a/examples/embedded/raycasting/CMakeLists.txt b/examples/embedded/raycasting/CMakeLists.txt index 36ac63ee700..8828ffccd80 100644 --- a/examples/embedded/raycasting/CMakeLists.txt +++ b/examples/embedded/raycasting/CMakeLists.txt @@ -36,7 +36,7 @@ set(raycasting_resource_files "textures.png" ) -qt6_add_resources(raycasting "raycasting" +qt_add_resources(raycasting "raycasting" PREFIX "/" FILES diff --git a/examples/embedded/styleexample/CMakeLists.txt b/examples/embedded/styleexample/CMakeLists.txt index dcaadf2212f..c04dee40837 100644 --- a/examples/embedded/styleexample/CMakeLists.txt +++ b/examples/embedded/styleexample/CMakeLists.txt @@ -44,7 +44,7 @@ set(styleexample_resource_files "files/transparent.qss" ) -qt6_add_resources(styleexample "styleexample" +qt_add_resources(styleexample "styleexample" PREFIX "/" FILES diff --git a/examples/network/securesocketclient/CMakeLists.txt b/examples/network/securesocketclient/CMakeLists.txt index b077a9791f3..3cce8c86416 100644 --- a/examples/network/securesocketclient/CMakeLists.txt +++ b/examples/network/securesocketclient/CMakeLists.txt @@ -40,7 +40,7 @@ set(securesocketclient_resource_files "encrypted.png" ) -qt6_add_resources(securesocketclient "securesocketclient" +qt_add_resources(securesocketclient "securesocketclient" PREFIX "/" FILES diff --git a/examples/network/torrent/CMakeLists.txt b/examples/network/torrent/CMakeLists.txt index 1e98f4d3417..c5480841f7a 100644 --- a/examples/network/torrent/CMakeLists.txt +++ b/examples/network/torrent/CMakeLists.txt @@ -56,7 +56,7 @@ set(icons_resource_files "icons/player_stop.png" ) -qt6_add_resources(torrent "icons" +qt_add_resources(torrent "icons" PREFIX "/" FILES diff --git a/examples/opengl/computegles31/CMakeLists.txt b/examples/opengl/computegles31/CMakeLists.txt index dfd73691aa4..10c00368876 100644 --- a/examples/opengl/computegles31/CMakeLists.txt +++ b/examples/opengl/computegles31/CMakeLists.txt @@ -37,7 +37,7 @@ set(computegles31_resource_files "Qt-logo-medium.png" ) -qt6_add_resources(computegles31 "computegles31" +qt_add_resources(computegles31 "computegles31" PREFIX "/" FILES diff --git a/examples/opengl/hellogles3/CMakeLists.txt b/examples/opengl/hellogles3/CMakeLists.txt index 54c1fecb773..365526dde24 100644 --- a/examples/opengl/hellogles3/CMakeLists.txt +++ b/examples/opengl/hellogles3/CMakeLists.txt @@ -38,7 +38,7 @@ set(hellogles3_resource_files "qtlogo.png" ) -qt6_add_resources(hellogles3 "hellogles3" +qt_add_resources(hellogles3 "hellogles3" PREFIX "/" FILES diff --git a/examples/opengl/qopenglwindow/CMakeLists.txt b/examples/opengl/qopenglwindow/CMakeLists.txt index 539ba086158..06023505e70 100644 --- a/examples/opengl/qopenglwindow/CMakeLists.txt +++ b/examples/opengl/qopenglwindow/CMakeLists.txt @@ -41,7 +41,7 @@ set(shaders_resource_files "background.frag" ) -qt6_add_resources(qopenglwindow "shaders" +qt_add_resources(qopenglwindow "shaders" PREFIX "/" FILES diff --git a/examples/sql/books/CMakeLists.txt b/examples/sql/books/CMakeLists.txt index 4c3e085f978..7135c4dfc5e 100644 --- a/examples/sql/books/CMakeLists.txt +++ b/examples/sql/books/CMakeLists.txt @@ -44,7 +44,7 @@ set(books_resource_files "images/star.png" ) -qt6_add_resources(books "books" +qt_add_resources(books "books" PREFIX "/" FILES diff --git a/examples/sql/drilldown/CMakeLists.txt b/examples/sql/drilldown/CMakeLists.txt index e8834c348f6..6d77f0f6da4 100644 --- a/examples/sql/drilldown/CMakeLists.txt +++ b/examples/sql/drilldown/CMakeLists.txt @@ -44,7 +44,7 @@ set(drilldown_resource_files "images/qt-quick.png" ) -qt6_add_resources(drilldown "drilldown" +qt_add_resources(drilldown "drilldown" PREFIX "/" FILES diff --git a/examples/sql/masterdetail/CMakeLists.txt b/examples/sql/masterdetail/CMakeLists.txt index 1f3f2d9e443..b45b7b051aa 100644 --- a/examples/sql/masterdetail/CMakeLists.txt +++ b/examples/sql/masterdetail/CMakeLists.txt @@ -42,7 +42,7 @@ set(masterdetail_resource_files "images/image.png" ) -qt6_add_resources(masterdetail "masterdetail" +qt_add_resources(masterdetail "masterdetail" PREFIX "/" FILES diff --git a/examples/vulkan/hellovulkantexture/CMakeLists.txt b/examples/vulkan/hellovulkantexture/CMakeLists.txt index c8ca13f3f84..de0175de833 100644 --- a/examples/vulkan/hellovulkantexture/CMakeLists.txt +++ b/examples/vulkan/hellovulkantexture/CMakeLists.txt @@ -38,7 +38,7 @@ set(hellovulkantexture_resource_files "texture_vert.spv" ) -qt6_add_resources(hellovulkantexture "hellovulkantexture" +qt_add_resources(hellovulkantexture "hellovulkantexture" PREFIX "/" FILES diff --git a/examples/vulkan/hellovulkantriangle/CMakeLists.txt b/examples/vulkan/hellovulkantriangle/CMakeLists.txt index d72851217d3..2f3d0ffee56 100644 --- a/examples/vulkan/hellovulkantriangle/CMakeLists.txt +++ b/examples/vulkan/hellovulkantriangle/CMakeLists.txt @@ -43,7 +43,7 @@ set(hellovulkantriangle_resource_files "../shared/color_vert.spv" ) -qt6_add_resources(hellovulkantriangle "hellovulkantriangle" +qt_add_resources(hellovulkantriangle "hellovulkantriangle" PREFIX "/" FILES diff --git a/examples/vulkan/hellovulkanwidget/CMakeLists.txt b/examples/vulkan/hellovulkanwidget/CMakeLists.txt index 5b896ae09e1..575f7bc42ec 100644 --- a/examples/vulkan/hellovulkanwidget/CMakeLists.txt +++ b/examples/vulkan/hellovulkanwidget/CMakeLists.txt @@ -45,7 +45,7 @@ set(hellovulkanwidget_resource_files "../shared/color_vert.spv" ) -qt6_add_resources(hellovulkanwidget "hellovulkanwidget" +qt_add_resources(hellovulkanwidget "hellovulkanwidget" PREFIX "/" FILES diff --git a/examples/widgets/animation/easing/CMakeLists.txt b/examples/widgets/animation/easing/CMakeLists.txt index b825447086e..503c394ec65 100644 --- a/examples/widgets/animation/easing/CMakeLists.txt +++ b/examples/widgets/animation/easing/CMakeLists.txt @@ -39,7 +39,7 @@ set(easing_resource_files "images/qt-logo.png" ) -qt6_add_resources(easing "easing" +qt_add_resources(easing "easing" PREFIX "/" FILES diff --git a/examples/widgets/desktop/systray/CMakeLists.txt b/examples/widgets/desktop/systray/CMakeLists.txt index 34d822de27a..dd136a293dd 100644 --- a/examples/widgets/desktop/systray/CMakeLists.txt +++ b/examples/widgets/desktop/systray/CMakeLists.txt @@ -39,7 +39,7 @@ set(systray_resource_files "images/trash.png" ) -qt6_add_resources(systray "systray" +qt_add_resources(systray "systray" PREFIX "/" FILES diff --git a/examples/widgets/dialogs/classwizard/CMakeLists.txt b/examples/widgets/dialogs/classwizard/CMakeLists.txt index e19fb81d960..ea964bd937f 100644 --- a/examples/widgets/dialogs/classwizard/CMakeLists.txt +++ b/examples/widgets/dialogs/classwizard/CMakeLists.txt @@ -43,7 +43,7 @@ set(classwizard_resource_files "images/watermark2.png" ) -qt6_add_resources(classwizard "classwizard" +qt_add_resources(classwizard "classwizard" PREFIX "/" FILES diff --git a/examples/widgets/dialogs/licensewizard/CMakeLists.txt b/examples/widgets/dialogs/licensewizard/CMakeLists.txt index ba17e5a252d..e9bfc7b588e 100644 --- a/examples/widgets/dialogs/licensewizard/CMakeLists.txt +++ b/examples/widgets/dialogs/licensewizard/CMakeLists.txt @@ -39,7 +39,7 @@ set(licensewizard_resource_files "images/watermark.png" ) -qt6_add_resources(licensewizard "licensewizard" +qt_add_resources(licensewizard "licensewizard" PREFIX "/" FILES diff --git a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt index 8ec0ebad6d0..c6ebe537494 100644 --- a/examples/widgets/draganddrop/draggableicons/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggableicons/CMakeLists.txt @@ -39,7 +39,7 @@ set(draggableicons_resource_files "images/house.png" ) -qt6_add_resources(draggableicons "draggableicons" +qt_add_resources(draggableicons "draggableicons" PREFIX "/" FILES diff --git a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt index 090c6807c27..0ae6758d416 100644 --- a/examples/widgets/draganddrop/draggabletext/CMakeLists.txt +++ b/examples/widgets/draganddrop/draggabletext/CMakeLists.txt @@ -37,7 +37,7 @@ set(draggabletext_resource_files "words.txt" ) -qt6_add_resources(draggabletext "draggabletext" +qt_add_resources(draggabletext "draggabletext" PREFIX "/dictionary" FILES diff --git a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt index 8f4ddb11076..eef163b6823 100644 --- a/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt +++ b/examples/widgets/draganddrop/fridgemagnets/CMakeLists.txt @@ -38,7 +38,7 @@ set(fridgemagnets_resource_files "words.txt" ) -qt6_add_resources(fridgemagnets "fridgemagnets" +qt_add_resources(fridgemagnets "fridgemagnets" PREFIX "/dictionary" FILES diff --git a/examples/widgets/draganddrop/puzzle/CMakeLists.txt b/examples/widgets/draganddrop/puzzle/CMakeLists.txt index f36fffd4540..9cb2a85437e 100644 --- a/examples/widgets/draganddrop/puzzle/CMakeLists.txt +++ b/examples/widgets/draganddrop/puzzle/CMakeLists.txt @@ -39,7 +39,7 @@ set(puzzle_resource_files "example.jpg" ) -qt6_add_resources(draganddrop_puzzle "puzzle" # special case +qt_add_resources(draganddrop_puzzle "puzzle" # special case PREFIX "/images" FILES diff --git a/examples/widgets/effects/blurpicker/CMakeLists.txt b/examples/widgets/effects/blurpicker/CMakeLists.txt index 8bfb1da19a5..ee2572a1a28 100644 --- a/examples/widgets/effects/blurpicker/CMakeLists.txt +++ b/examples/widgets/effects/blurpicker/CMakeLists.txt @@ -46,7 +46,7 @@ set(blurpicker_resource_files "images/system-users.png" ) -qt6_add_resources(blurpicker "blurpicker" +qt_add_resources(blurpicker "blurpicker" PREFIX "/" FILES diff --git a/examples/widgets/effects/fademessage/CMakeLists.txt b/examples/widgets/effects/fademessage/CMakeLists.txt index 94cfd80f7c0..da736fe0156 100644 --- a/examples/widgets/effects/fademessage/CMakeLists.txt +++ b/examples/widgets/effects/fademessage/CMakeLists.txt @@ -37,7 +37,7 @@ set(fademessage_resource_files "background.jpg" ) -qt6_add_resources(fademessage "fademessage" +qt_add_resources(fademessage "fademessage" PREFIX "/" FILES diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt index 96d9c46aadf..1c7363aeddd 100644 --- a/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt +++ b/examples/widgets/graphicsview/basicgraphicslayouts/CMakeLists.txt @@ -38,7 +38,7 @@ set(basicgraphicslayouts_resource_files "images/block.png" ) -qt6_add_resources(basicgraphicslayouts "basicgraphicslayouts" +qt_add_resources(basicgraphicslayouts "basicgraphicslayouts" PREFIX "/" FILES diff --git a/examples/widgets/graphicsview/chip/CMakeLists.txt b/examples/widgets/graphicsview/chip/CMakeLists.txt index 1112a84f130..f614113afb7 100644 --- a/examples/widgets/graphicsview/chip/CMakeLists.txt +++ b/examples/widgets/graphicsview/chip/CMakeLists.txt @@ -47,7 +47,7 @@ set(images_resource_files "zoomout.png" ) -qt6_add_resources(chip "images" +qt_add_resources(chip "images" PREFIX "/" FILES diff --git a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt index f35147015b9..626441e4b08 100644 --- a/examples/widgets/graphicsview/collidingmice/CMakeLists.txt +++ b/examples/widgets/graphicsview/collidingmice/CMakeLists.txt @@ -37,7 +37,7 @@ set(mice_resource_files "images/cheese.jpg" ) -qt6_add_resources(collidingmice "mice" +qt_add_resources(collidingmice "mice" PREFIX "/" FILES diff --git a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt index fd1cc77d6c7..1c00e498be9 100644 --- a/examples/widgets/graphicsview/diagramscene/CMakeLists.txt +++ b/examples/widgets/graphicsview/diagramscene/CMakeLists.txt @@ -55,7 +55,7 @@ set(diagramscene_resource_files "images/underline.png" ) -qt6_add_resources(diagramscene "diagramscene" +qt_add_resources(diagramscene "diagramscene" PREFIX "/" FILES diff --git a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt index dadb201304d..3ca5251a53f 100644 --- a/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt +++ b/examples/widgets/graphicsview/dragdroprobot/CMakeLists.txt @@ -38,7 +38,7 @@ set(robot_resource_files "images/head.png" ) -qt6_add_resources(dragdroprobot "robot" +qt_add_resources(dragdroprobot "robot" PREFIX "/" FILES diff --git a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt index deedf5084ea..6c1896bbd3b 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt +++ b/examples/widgets/graphicsview/embeddeddialogs/CMakeLists.txt @@ -38,7 +38,7 @@ set(embeddeddialogs_resource_files "No-Ones-Laughing-3.jpg" ) -qt6_add_resources(embeddeddialogs "embeddeddialogs" +qt_add_resources(embeddeddialogs "embeddeddialogs" PREFIX "/" FILES diff --git a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt index e10f1790d51..8490d8a951a 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt +++ b/examples/widgets/graphicsview/weatheranchorlayout/CMakeLists.txt @@ -41,7 +41,7 @@ set(weatheranchorlayout_resource_files "images/weather-few-clouds.png" ) -qt6_add_resources(weatheranchorlayout "weatheranchorlayout" +qt_add_resources(weatheranchorlayout "weatheranchorlayout" PREFIX "/" FILES diff --git a/examples/widgets/itemviews/chart/CMakeLists.txt b/examples/widgets/itemviews/chart/CMakeLists.txt index 4b88f8c1810..d1918b82ea2 100644 --- a/examples/widgets/itemviews/chart/CMakeLists.txt +++ b/examples/widgets/itemviews/chart/CMakeLists.txt @@ -38,7 +38,7 @@ set(chart_resource_files "qtdata.cht" ) -qt6_add_resources(chart "chart" +qt_add_resources(chart "chart" PREFIX "/Charts" FILES diff --git a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt index 87d006b4217..6858d3372cd 100644 --- a/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt +++ b/examples/widgets/itemviews/customsortfiltermodel/CMakeLists.txt @@ -39,7 +39,7 @@ set(customsortfiltermodel_resource_files "images/find.png" ) -qt6_add_resources(customsortfiltermodel "customsortfiltermodel" +qt_add_resources(customsortfiltermodel "customsortfiltermodel" PREFIX "/" FILES diff --git a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt index 276ed89f80d..5e8ce72f4d8 100644 --- a/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt +++ b/examples/widgets/itemviews/editabletreemodel/CMakeLists.txt @@ -39,7 +39,7 @@ set(editabletreemodel_resource_files "default.txt" ) -qt6_add_resources(editabletreemodel "editabletreemodel" +qt_add_resources(editabletreemodel "editabletreemodel" PREFIX "/" FILES diff --git a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt index ec9cf5e232a..1fef5bf76cb 100644 --- a/examples/widgets/itemviews/frozencolumn/CMakeLists.txt +++ b/examples/widgets/itemviews/frozencolumn/CMakeLists.txt @@ -37,7 +37,7 @@ set(grades_resource_files "grades.txt" ) -qt6_add_resources(frozencolumn "grades" +qt_add_resources(frozencolumn "grades" PREFIX "/" FILES diff --git a/examples/widgets/itemviews/interview/CMakeLists.txt b/examples/widgets/itemviews/interview/CMakeLists.txt index 60f2b8bc7ee..11cc25796e9 100644 --- a/examples/widgets/itemviews/interview/CMakeLists.txt +++ b/examples/widgets/itemviews/interview/CMakeLists.txt @@ -39,7 +39,7 @@ set(interview_resource_files "images/services.png" ) -qt6_add_resources(interview "interview" +qt_add_resources(interview "interview" PREFIX "/" FILES diff --git a/examples/widgets/itemviews/pixelator/CMakeLists.txt b/examples/widgets/itemviews/pixelator/CMakeLists.txt index 7aaa71b9f2b..0126dce3284 100644 --- a/examples/widgets/itemviews/pixelator/CMakeLists.txt +++ b/examples/widgets/itemviews/pixelator/CMakeLists.txt @@ -42,7 +42,7 @@ set(images_resource_files "images/qt.png" ) -qt6_add_resources(pixelator "images" +qt_add_resources(pixelator "images" PREFIX "/" FILES diff --git a/examples/widgets/itemviews/puzzle/CMakeLists.txt b/examples/widgets/itemviews/puzzle/CMakeLists.txt index 545f173754f..9d6808a3d02 100644 --- a/examples/widgets/itemviews/puzzle/CMakeLists.txt +++ b/examples/widgets/itemviews/puzzle/CMakeLists.txt @@ -39,7 +39,7 @@ set(puzzle_resource_files "example.jpg" ) -qt6_add_resources(itemviews_puzzle "puzzle" +qt_add_resources(itemviews_puzzle "puzzle" PREFIX "/images" FILES diff --git a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt index 2bbc2626348..f8e72a2a0e9 100644 --- a/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt +++ b/examples/widgets/itemviews/simpletreemodel/CMakeLists.txt @@ -38,7 +38,7 @@ set(simpletreemodel_resource_files "default.txt" ) -qt6_add_resources(simpletreemodel "simpletreemodel" +qt_add_resources(simpletreemodel "simpletreemodel" PREFIX "/" FILES diff --git a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt index 7483ffa9fa1..8847cb96eeb 100644 --- a/examples/widgets/itemviews/spreadsheet/CMakeLists.txt +++ b/examples/widgets/itemviews/spreadsheet/CMakeLists.txt @@ -48,7 +48,7 @@ set(spreadsheet_resource_files "images/interview.png" ) -qt6_add_resources(spreadsheet "spreadsheet" +qt_add_resources(spreadsheet "spreadsheet" PREFIX "/" FILES diff --git a/examples/widgets/mainwindows/application/CMakeLists.txt b/examples/widgets/mainwindows/application/CMakeLists.txt index 8d4622cf82b..debd65da83f 100644 --- a/examples/widgets/mainwindows/application/CMakeLists.txt +++ b/examples/widgets/mainwindows/application/CMakeLists.txt @@ -42,7 +42,7 @@ set(application_resource_files "images/save.png" ) -qt6_add_resources(application "application" +qt_add_resources(application "application" PREFIX "/" FILES diff --git a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt index a18fc211c6d..90eec8c509a 100644 --- a/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt +++ b/examples/widgets/mainwindows/dockwidgets/CMakeLists.txt @@ -48,7 +48,7 @@ set(dockwidgets_resource_files "images/undo.png" ) -qt6_add_resources(dockwidgets "dockwidgets" +qt_add_resources(dockwidgets "dockwidgets" PREFIX "/" FILES diff --git a/examples/widgets/mainwindows/mainwindow/CMakeLists.txt b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt index eb04152dbf0..33d367628a2 100644 --- a/examples/widgets/mainwindows/mainwindow/CMakeLists.txt +++ b/examples/widgets/mainwindows/mainwindow/CMakeLists.txt @@ -42,7 +42,7 @@ set(mainwindow_resource_files "titlebarRight.png" ) -qt6_add_resources(mainwindow "mainwindow" +qt_add_resources(mainwindow "mainwindow" PREFIX "/res" FILES diff --git a/examples/widgets/mainwindows/mdi/CMakeLists.txt b/examples/widgets/mainwindows/mdi/CMakeLists.txt index 83057a8c8ce..038dabf9963 100644 --- a/examples/widgets/mainwindows/mdi/CMakeLists.txt +++ b/examples/widgets/mainwindows/mdi/CMakeLists.txt @@ -43,7 +43,7 @@ set(mdi_resource_files "images/save.png" ) -qt6_add_resources(mdi "mdi" +qt_add_resources(mdi "mdi" PREFIX "/" FILES diff --git a/examples/widgets/mainwindows/sdi/CMakeLists.txt b/examples/widgets/mainwindows/sdi/CMakeLists.txt index 885ba1c5e26..6f62c1e404f 100644 --- a/examples/widgets/mainwindows/sdi/CMakeLists.txt +++ b/examples/widgets/mainwindows/sdi/CMakeLists.txt @@ -42,7 +42,7 @@ set(sdi_resource_files "images/save.png" ) -qt6_add_resources(sdi "sdi" +qt_add_resources(sdi "sdi" PREFIX "/" FILES diff --git a/examples/widgets/painting/affine/CMakeLists.txt b/examples/widgets/painting/affine/CMakeLists.txt index 04d06301b46..dbc38202c25 100644 --- a/examples/widgets/painting/affine/CMakeLists.txt +++ b/examples/widgets/painting/affine/CMakeLists.txt @@ -88,7 +88,7 @@ set(shared_resource_files "../shared/images/title_stretch.png" ) -qt6_add_resources(affine "shared" +qt_add_resources(affine "shared" PREFIX "/res" BASE @@ -102,7 +102,7 @@ set(affine_resource_files "xform.html" ) -qt6_add_resources(affine "affine" +qt_add_resources(affine "affine" PREFIX "/res/affine" FILES diff --git a/examples/widgets/painting/basicdrawing/CMakeLists.txt b/examples/widgets/painting/basicdrawing/CMakeLists.txt index a53bf0dd643..a4778edbc1f 100644 --- a/examples/widgets/painting/basicdrawing/CMakeLists.txt +++ b/examples/widgets/painting/basicdrawing/CMakeLists.txt @@ -39,7 +39,7 @@ set(basicdrawing_resource_files "images/qt-logo.png" ) -qt6_add_resources(basicdrawing "basicdrawing" +qt_add_resources(basicdrawing "basicdrawing" PREFIX "/" FILES diff --git a/examples/widgets/painting/composition/CMakeLists.txt b/examples/widgets/painting/composition/CMakeLists.txt index 119524cf29e..3e48a688fac 100644 --- a/examples/widgets/painting/composition/CMakeLists.txt +++ b/examples/widgets/painting/composition/CMakeLists.txt @@ -88,7 +88,7 @@ set(shared_resource_files "../shared/images/title_stretch.png" ) -qt6_add_resources(composition "shared" +qt_add_resources(composition "shared" PREFIX "/res" BASE @@ -103,7 +103,7 @@ set(composition_resource_files "flower_alpha.jpg" ) -qt6_add_resources(composition "composition" +qt_add_resources(composition "composition" PREFIX "/res/composition" FILES diff --git a/examples/widgets/painting/deform/CMakeLists.txt b/examples/widgets/painting/deform/CMakeLists.txt index e6ad71bb25e..feadb84a6a2 100644 --- a/examples/widgets/painting/deform/CMakeLists.txt +++ b/examples/widgets/painting/deform/CMakeLists.txt @@ -88,7 +88,7 @@ set(shared_resource_files "../shared/images/title_stretch.png" ) -qt6_add_resources(deform "shared" +qt_add_resources(deform "shared" PREFIX "/res" BASE @@ -101,7 +101,7 @@ set(deform_resource_files "pathdeform.html" ) -qt6_add_resources(deform "deform" +qt_add_resources(deform "deform" PREFIX "/res/deform" FILES diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt index b1881f29a46..62dca0045d2 100644 --- a/examples/widgets/painting/gradients/CMakeLists.txt +++ b/examples/widgets/painting/gradients/CMakeLists.txt @@ -88,7 +88,7 @@ set(shared_resource_files "../shared/images/title_stretch.png" ) -qt6_add_resources(gradients "shared" +qt_add_resources(gradients "shared" PREFIX "/res" BASE @@ -101,7 +101,7 @@ set(gradients_resource_files "gradients.html" ) -qt6_add_resources(gradients "gradients" +qt_add_resources(gradients "gradients" PREFIX "/res/gradients" FILES diff --git a/examples/widgets/painting/imagecomposition/CMakeLists.txt b/examples/widgets/painting/imagecomposition/CMakeLists.txt index 3705d5100ee..4df69207f28 100644 --- a/examples/widgets/painting/imagecomposition/CMakeLists.txt +++ b/examples/widgets/painting/imagecomposition/CMakeLists.txt @@ -38,7 +38,7 @@ set(imagecomposition_resource_files "images/checker.png" ) -qt6_add_resources(imagecomposition "imagecomposition" +qt_add_resources(imagecomposition "imagecomposition" PREFIX "/" FILES diff --git a/examples/widgets/painting/pathstroke/CMakeLists.txt b/examples/widgets/painting/pathstroke/CMakeLists.txt index 1e8053ac861..8c84afcb6ee 100644 --- a/examples/widgets/painting/pathstroke/CMakeLists.txt +++ b/examples/widgets/painting/pathstroke/CMakeLists.txt @@ -88,7 +88,7 @@ set(shared_resource_files "../shared/images/title_stretch.png" ) -qt6_add_resources(pathstroke "shared" +qt_add_resources(pathstroke "shared" PREFIX "/res" BASE @@ -101,7 +101,7 @@ set(pathstroke_resource_files "pathstroke.html" ) -qt6_add_resources(pathstroke "pathstroke" +qt_add_resources(pathstroke "pathstroke" PREFIX "/res/pathstroke" FILES diff --git a/examples/widgets/richtext/textedit/CMakeLists.txt b/examples/widgets/richtext/textedit/CMakeLists.txt index fd53593cd2d..7190e8d5b10 100644 --- a/examples/widgets/richtext/textedit/CMakeLists.txt +++ b/examples/widgets/richtext/textedit/CMakeLists.txt @@ -94,7 +94,7 @@ set(textedit_resource_files "images/win/zoomout.png" ) -qt6_add_resources(textedit "textedit" +qt_add_resources(textedit "textedit" PREFIX "/" FILES diff --git a/examples/widgets/tools/completer/CMakeLists.txt b/examples/widgets/tools/completer/CMakeLists.txt index 80f64a6b8a4..cbcf19421c4 100644 --- a/examples/widgets/tools/completer/CMakeLists.txt +++ b/examples/widgets/tools/completer/CMakeLists.txt @@ -39,7 +39,7 @@ set(completer_resource_files "resources/wordlist.txt" ) -qt6_add_resources(completer "completer" +qt_add_resources(completer "completer" PREFIX "/" FILES diff --git a/examples/widgets/tools/customcompleter/CMakeLists.txt b/examples/widgets/tools/customcompleter/CMakeLists.txt index 2b610e91155..cb26eb1c794 100644 --- a/examples/widgets/tools/customcompleter/CMakeLists.txt +++ b/examples/widgets/tools/customcompleter/CMakeLists.txt @@ -38,7 +38,7 @@ set(customcompleter_resource_files "resources/wordlist.txt" ) -qt6_add_resources(customcompleter "customcompleter" +qt_add_resources(customcompleter "customcompleter" PREFIX "/" FILES diff --git a/examples/widgets/tools/i18n/CMakeLists.txt b/examples/widgets/tools/i18n/CMakeLists.txt index 8e9e3115ed3..2d8c3a21d9e 100644 --- a/examples/widgets/tools/i18n/CMakeLists.txt +++ b/examples/widgets/tools/i18n/CMakeLists.txt @@ -51,7 +51,7 @@ set(i18n_resource_files "translations/i18n_zh.qm" ) -qt6_add_resources(i18n "i18n" +qt_add_resources(i18n "i18n" PREFIX "/" FILES diff --git a/examples/widgets/tools/regularexpression/CMakeLists.txt b/examples/widgets/tools/regularexpression/CMakeLists.txt index 93756888126..4d2be816a57 100644 --- a/examples/widgets/tools/regularexpression/CMakeLists.txt +++ b/examples/widgets/tools/regularexpression/CMakeLists.txt @@ -37,7 +37,7 @@ set(regularexpression_resource_files "images/copy.png" ) -qt6_add_resources(regularexpression "regularexpression" +qt_add_resources(regularexpression "regularexpression" PREFIX "/" FILES diff --git a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt index e69dac71882..5e094b381e1 100644 --- a/examples/widgets/tools/treemodelcompleter/CMakeLists.txt +++ b/examples/widgets/tools/treemodelcompleter/CMakeLists.txt @@ -38,7 +38,7 @@ set(treemodelcompleter_resource_files "resources/treemodel.txt" ) -qt6_add_resources(treemodelcompleter "treemodelcompleter" +qt_add_resources(treemodelcompleter "treemodelcompleter" PREFIX "/" FILES diff --git a/examples/widgets/tools/undo/CMakeLists.txt b/examples/widgets/tools/undo/CMakeLists.txt index ee1bb3ed9e6..0a842715e5a 100644 --- a/examples/widgets/tools/undo/CMakeLists.txt +++ b/examples/widgets/tools/undo/CMakeLists.txt @@ -54,7 +54,7 @@ set(undo_resource_files "icons/undo.png" ) -qt6_add_resources(undo "undo" +qt_add_resources(undo "undo" PREFIX "/" FILES diff --git a/examples/widgets/tools/undoframework/CMakeLists.txt b/examples/widgets/tools/undoframework/CMakeLists.txt index fa140b790b4..b54e5a01a7a 100644 --- a/examples/widgets/tools/undoframework/CMakeLists.txt +++ b/examples/widgets/tools/undoframework/CMakeLists.txt @@ -40,7 +40,7 @@ set(undoframework_resource_files "images/cross.png" ) -qt6_add_resources(undoframework "undoframework" +qt_add_resources(undoframework "undoframework" PREFIX "/" FILES diff --git a/examples/widgets/touch/pinchzoom/CMakeLists.txt b/examples/widgets/touch/pinchzoom/CMakeLists.txt index 8cd144c7011..8d67cfffe37 100644 --- a/examples/widgets/touch/pinchzoom/CMakeLists.txt +++ b/examples/widgets/touch/pinchzoom/CMakeLists.txt @@ -38,7 +38,7 @@ set(mice_resource_files "images/cheese.jpg" ) -qt6_add_resources(pinchzoom "mice" +qt_add_resources(pinchzoom "mice" PREFIX "/" FILES diff --git a/examples/widgets/tutorials/notepad/CMakeLists.txt b/examples/widgets/tutorials/notepad/CMakeLists.txt index 0ea8142c15a..e8d24a71819 100644 --- a/examples/widgets/tutorials/notepad/CMakeLists.txt +++ b/examples/widgets/tutorials/notepad/CMakeLists.txt @@ -57,7 +57,7 @@ set(notepad_resource_files "images/underline.png" ) -qt6_add_resources(notepad "notepad" +qt_add_resources(notepad "notepad" PREFIX "/" FILES diff --git a/examples/widgets/widgets/styles/CMakeLists.txt b/examples/widgets/widgets/styles/CMakeLists.txt index 49502b1a9ce..ac33b59b723 100644 --- a/examples/widgets/widgets/styles/CMakeLists.txt +++ b/examples/widgets/widgets/styles/CMakeLists.txt @@ -39,7 +39,7 @@ set(styles_resource_files "images/woodbutton.png" ) -qt6_add_resources(styles "styles" +qt_add_resources(styles "styles" PREFIX "/" FILES diff --git a/examples/widgets/widgets/stylesheet/CMakeLists.txt b/examples/widgets/widgets/stylesheet/CMakeLists.txt index 0696613a382..63286c3e950 100644 --- a/examples/widgets/widgets/stylesheet/CMakeLists.txt +++ b/examples/widgets/widgets/stylesheet/CMakeLists.txt @@ -72,7 +72,7 @@ set(stylesheet_resource_files "qss/pagefold.qss" ) -qt6_add_resources(stylesheet "stylesheet" +qt_add_resources(stylesheet "stylesheet" PREFIX "/" FILES diff --git a/examples/widgets/widgets/tablet/CMakeLists.txt b/examples/widgets/widgets/tablet/CMakeLists.txt index 6818898dfb8..233c5cb03c5 100644 --- a/examples/widgets/widgets/tablet/CMakeLists.txt +++ b/examples/widgets/widgets/tablet/CMakeLists.txt @@ -42,7 +42,7 @@ set(images_resource_files "images/cursor-pencil.png" ) -qt6_add_resources(qttablet "images" +qt_add_resources(qttablet "images" PREFIX "/" FILES diff --git a/examples/widgets/widgets/tooltips/CMakeLists.txt b/examples/widgets/widgets/tooltips/CMakeLists.txt index 352da5bb37c..49291c48f71 100644 --- a/examples/widgets/widgets/tooltips/CMakeLists.txt +++ b/examples/widgets/widgets/tooltips/CMakeLists.txt @@ -40,7 +40,7 @@ set(tooltips_resource_files "images/triangle.png" ) -qt6_add_resources(tooltips "tooltips" +qt_add_resources(tooltips "tooltips" PREFIX "/" FILES diff --git a/examples/widgets/widgets/validators/CMakeLists.txt b/examples/widgets/widgets/validators/CMakeLists.txt index 257ccbeccae..a14f210711c 100644 --- a/examples/widgets/widgets/validators/CMakeLists.txt +++ b/examples/widgets/widgets/validators/CMakeLists.txt @@ -41,7 +41,7 @@ set(validators_resource_files "ledon.png" ) -qt6_add_resources(validators "validators" +qt_add_resources(validators "validators" PREFIX "/" FILES diff --git a/examples/xml/htmlinfo/CMakeLists.txt b/examples/xml/htmlinfo/CMakeLists.txt index 6740fd00e8a..3c7744a1bb5 100644 --- a/examples/xml/htmlinfo/CMakeLists.txt +++ b/examples/xml/htmlinfo/CMakeLists.txt @@ -38,7 +38,7 @@ set(resources_resource_files "youtube_com.html" ) -qt6_add_resources(htmlinfo "resources" +qt_add_resources(htmlinfo "resources" PREFIX "/" FILES