From 574cf24a6531ca4fd69e9f989d86074b0f52bd82 Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Tue, 16 May 2023 12:03:12 +0200 Subject: [PATCH] Replace AUTO_RESOURCE_PREFIX with RESOURCE_PREFIX in qt-cmake-project Pick-to: 6.5 Change-Id: I53b9e8887e8e79c1c1e836c514171aece8cf35aa Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann --- cmake/QtInitProject.cmake | 2 +- .../testdata/qml_project/CMakeLists.txt.expected | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/QtInitProject.cmake b/cmake/QtInitProject.cmake index 3a8d11459f8..a42f59f5c8a 100644 --- a/cmake/QtInitProject.cmake +++ b/cmake/QtInitProject.cmake @@ -95,7 +95,7 @@ handle_type(qml EXTENSIONS .qml .js .mjs MODULES Gui Qml Quick TEMPLATE URI ${project_name} OUTPUT_DIRECTORY qml VERSION 1.0 - AUTO_RESOURCE_PREFIX + RESOURCE_PREFIX /qt/qml QML_FILES @files@ )" diff --git a/tests/auto/tools/qt_cmake_create/testdata/qml_project/CMakeLists.txt.expected b/tests/auto/tools/qt_cmake_create/testdata/qml_project/CMakeLists.txt.expected index 1befe64ffd7..1187b0e54a2 100644 --- a/tests/auto/tools/qt_cmake_create/testdata/qml_project/CMakeLists.txt.expected +++ b/tests/auto/tools/qt_cmake_create/testdata/qml_project/CMakeLists.txt.expected @@ -12,7 +12,7 @@ qt_add_qml_module(qml_project URI qml_project OUTPUT_DIRECTORY qml VERSION 1.0 - AUTO_RESOURCE_PREFIX + RESOURCE_PREFIX /qt/qml QML_FILES TestComponent.qml main.qml