From 945d8b29a86a7f8efe5d322aaa97b16e613f4cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 2 May 2023 12:32:32 +0200 Subject: Examples: Use unversioned CMake commands Prefer unversioned commands over qt6_ ones - even though the target-based qt_add_resources command is actually new in Qt 6. But we will evolve the API also between major Qt versions, so it's better to work with the Qt policies mechanism instead of relying on version numbers in the command API. Change-Id: If302abb1f22a7ab96c98a8ad2e9c871b9bedb0e9 Reviewed-by: Alexey Edelev (cherry picked from commit d02810b25f5b6eeacec1cbe4036c472d38734ed0) Reviewed-by: Qt Cherry-pick Bot --- examples/demos/calqlatr/CMakeLists.txt | 2 +- examples/demos/clocks/CMakeLists.txt | 2 +- examples/demos/coffee/CMakeLists.txt | 2 +- examples/demos/maroon/CMakeLists.txt | 2 +- examples/demos/photosurface/CMakeLists.txt | 2 +- examples/demos/photoviewer/CMakeLists.txt | 2 +- examples/demos/rssnews/CMakeLists.txt | 2 +- examples/demos/samegame/CMakeLists.txt | 2 +- examples/demos/stocqt/CMakeLists.txt | 2 +- examples/demos/tweetsearch/CMakeLists.txt | 2 +- examples/tutorials/alarms/CMakeLists.txt | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/demos/calqlatr/CMakeLists.txt b/examples/demos/calqlatr/CMakeLists.txt index 13102f96..989c8890 100644 --- a/examples/demos/calqlatr/CMakeLists.txt +++ b/examples/demos/calqlatr/CMakeLists.txt @@ -25,7 +25,7 @@ target_link_libraries(calqlatrexample PRIVATE Qt6::Quick ) -qt6_add_qml_module(calqlatrexample +qt_add_qml_module(calqlatrexample URI demos.calqlatr VERSION 1.0 QML_FILES diff --git a/examples/demos/clocks/CMakeLists.txt b/examples/demos/clocks/CMakeLists.txt index 9fc27be7..428e8cb4 100644 --- a/examples/demos/clocks/CMakeLists.txt +++ b/examples/demos/clocks/CMakeLists.txt @@ -45,7 +45,7 @@ set(clocks_resource_files "content/second.png" ) -qt6_add_resources(clocks "clocks" +qt_add_resources(clocks "clocks" PREFIX "/demos/clocks" FILES diff --git a/examples/demos/coffee/CMakeLists.txt b/examples/demos/coffee/CMakeLists.txt index ec5415b8..3994fe06 100644 --- a/examples/demos/coffee/CMakeLists.txt +++ b/examples/demos/coffee/CMakeLists.txt @@ -69,7 +69,7 @@ set(qml_resource_files "qtquickcontrols2.conf" ) -qt6_add_resources(coffee "qml" +qt_add_resources(coffee "qml" PREFIX "/" FILES diff --git a/examples/demos/maroon/CMakeLists.txt b/examples/demos/maroon/CMakeLists.txt index 2655517d..73fed047 100644 --- a/examples/demos/maroon/CMakeLists.txt +++ b/examples/demos/maroon/CMakeLists.txt @@ -101,7 +101,7 @@ set(maroon_resource_files "maroon.qml" ) -qt6_add_resources(maroon "maroon" +qt_add_resources(maroon "maroon" PREFIX "/demos/maroon" FILES diff --git a/examples/demos/photosurface/CMakeLists.txt b/examples/demos/photosurface/CMakeLists.txt index 9cea19fb..c794129b 100644 --- a/examples/demos/photosurface/CMakeLists.txt +++ b/examples/demos/photosurface/CMakeLists.txt @@ -57,7 +57,7 @@ qt_add_qml_module(photosurfaceexample "resources/welcome.pdf" ) -qt6_add_shaders(photosurfaceexample "shaders" +qt_add_shaders(photosurfaceexample "shaders" BATCHABLE PRECOMPILE OPTIMIZED diff --git a/examples/demos/photoviewer/CMakeLists.txt b/examples/demos/photoviewer/CMakeLists.txt index 1f67ad16..b7a7e8ee 100644 --- a/examples/demos/photoviewer/CMakeLists.txt +++ b/examples/demos/photoviewer/CMakeLists.txt @@ -48,7 +48,7 @@ set(qmake_immediate_resource_files "main.qml" ) -qt6_add_resources(photoviewer "qmake_immediate" +qt_add_resources(photoviewer "qmake_immediate" PREFIX "/" FILES diff --git a/examples/demos/rssnews/CMakeLists.txt b/examples/demos/rssnews/CMakeLists.txt index 000e6ddf..9660fe49 100644 --- a/examples/demos/rssnews/CMakeLists.txt +++ b/examples/demos/rssnews/CMakeLists.txt @@ -56,7 +56,7 @@ set(rssnews_resource_files "rssnews.qml" ) -qt6_add_resources(rssnews "rssnews" +qt_add_resources(rssnews "rssnews" PREFIX "/demos/rssnews" FILES diff --git a/examples/demos/samegame/CMakeLists.txt b/examples/demos/samegame/CMakeLists.txt index 79dd0684..ae49e1c5 100644 --- a/examples/demos/samegame/CMakeLists.txt +++ b/examples/demos/samegame/CMakeLists.txt @@ -104,7 +104,7 @@ set(samegame_resource_files "samegame.qml" ) -qt6_add_resources(samegame "samegame" +qt_add_resources(samegame "samegame" PREFIX "/demos/samegame" FILES diff --git a/examples/demos/stocqt/CMakeLists.txt b/examples/demos/stocqt/CMakeLists.txt index 02211033..527bda8f 100644 --- a/examples/demos/stocqt/CMakeLists.txt +++ b/examples/demos/stocqt/CMakeLists.txt @@ -72,7 +72,7 @@ set(stocqt_resource_files "stocqt.qml" ) -qt6_add_resources(stocqt "stocqt" +qt_add_resources(stocqt "stocqt" PREFIX "/demos/stocqt" FILES diff --git a/examples/demos/tweetsearch/CMakeLists.txt b/examples/demos/tweetsearch/CMakeLists.txt index 7acc3030..d84a0413 100644 --- a/examples/demos/tweetsearch/CMakeLists.txt +++ b/examples/demos/tweetsearch/CMakeLists.txt @@ -53,7 +53,7 @@ set(qmake_content_resource_files "tweetsearch.qml" ) -qt6_add_resources(tweetsearch "qmake_content" +qt_add_resources(tweetsearch "qmake_content" PREFIX "/demos/tweetsearch" FILES diff --git a/examples/tutorials/alarms/CMakeLists.txt b/examples/tutorials/alarms/CMakeLists.txt index 12be92e8..b66a6278 100644 --- a/examples/tutorials/alarms/CMakeLists.txt +++ b/examples/tutorials/alarms/CMakeLists.txt @@ -38,14 +38,14 @@ set(qml_resource_files "main.qml" ) -qt6_add_resources(alarms "qml" +qt_add_resources(alarms "qml" PREFIX "/alarms/" FILES ${qml_resource_files} ) -qt6_add_resources(alarms "controls_conf" +qt_add_resources(alarms "controls_conf" PREFIX "/" FILES -- cgit v1.2.1