summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@qt.io>2023-03-16 08:59:39 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-04-19 11:34:26 +0000
commit01d595d26e5b3a45789b41cf7879b9c5fef969b0 (patch)
tree104fbf43cbe283b2f895e7156d7c8b801edf395e
parent917555aa991749d19ddc14be902efd2c523d4ee2 (diff)
Adjust examples' CMake project setup
Addresses AUTO_RESOURCE_PREFIX deprecation message Change-Id: I09856728f7cd373c61d75b546024beb1d6c9b96e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> (cherry picked from commit 88dc04afe37d5ee4462b19edb8ffdc3c5a1af95b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/positioning/satelliteinfo/CMakeLists.txt3
-rw-r--r--examples/positioning/weatherinfo/CMakeLists.txt3
2 files changed, 2 insertions, 4 deletions
diff --git a/examples/positioning/satelliteinfo/CMakeLists.txt b/examples/positioning/satelliteinfo/CMakeLists.txt
index d0eda156..406f39a1 100644
--- a/examples/positioning/satelliteinfo/CMakeLists.txt
+++ b/examples/positioning/satelliteinfo/CMakeLists.txt
@@ -13,7 +13,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/positioning/satelliteinfo")
find_package(Qt6 REQUIRED COMPONENTS Core Quick PositioningQuick)
find_package(Qt6 OPTIONAL_COMPONENTS SerialPort)
-qt_standard_project_setup()
+qt_standard_project_setup(REQUIRES 6.5)
qt_add_executable(satelliteinfo
main.cpp
@@ -53,7 +53,6 @@ qt_add_resources(satelliteinfo "resources"
qt_add_qml_module(satelliteinfo
URI SatelliteInformation
VERSION 1.0
- AUTO_RESOURCE_PREFIX
QML_FILES
Button.qml
Main.qml
diff --git a/examples/positioning/weatherinfo/CMakeLists.txt b/examples/positioning/weatherinfo/CMakeLists.txt
index f44446a9..6e1117fc 100644
--- a/examples/positioning/weatherinfo/CMakeLists.txt
+++ b/examples/positioning/weatherinfo/CMakeLists.txt
@@ -12,7 +12,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/positioning/weatherinfo")
find_package(Qt6 REQUIRED COMPONENTS Core Gui Network Positioning Qml Quick)
-qt_standard_project_setup()
+qt_standard_project_setup(REQUIRES 6.5)
qt_add_executable(weatherinfo
main.cpp
@@ -43,7 +43,6 @@ endif()
qt_add_qml_module(weatherinfo
URI Weather
VERSION 1.0
- AUTO_RESOURCE_PREFIX
SOURCES
appmodel.cpp appmodel.h
openmeteobackend.cpp openmeteobackend.h