From f63bd1a80061e6d40fc05daedc2bc187c6fb9a3a Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 25 Jan 2022 16:13:56 +0100 Subject: [PATCH] Move generating of the QML related android deployment settings Use _qt_internal_generate_android_qml_deployment_settings from QtQml module when generating corresponding Android deployment settings. Task-number: QTBUG-97795 Change-Id: Ib509160e841fde98e818b0758bdfaff421dbc259 Reviewed-by: Alexandru Croitor --- src/corelib/Qt6AndroidMacros.cmake | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 7b7f56041f..ea0ebfd2b4 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -230,26 +230,6 @@ function(qt6_android_generate_deployment_settings target) _qt_internal_add_android_deployment_property(file_contents "android-target-sdk-version" ${target} "QT_ANDROID_TARGET_SDK_VERSION") - # QML import paths - if(NOT "${QT_QML_OUTPUT_DIRECTORY}" STREQUAL "") - # Need to prepend the default qml module output directory to take precedence - # over other qml import paths. By default QT_QML_OUTPUT_DIRECTORY is set to - # ${CMAKE_BINARY_DIR}/android-qml for Android. - get_target_property(native_qml_import_paths "${target}" _qt_native_qml_import_paths) - list(PREPEND native_qml_import_paths "${QT_QML_OUTPUT_DIRECTORY}") - set_property(TARGET "${target}" PROPERTY - "_qt_native_qml_import_paths" "${native_qml_import_paths}") - endif() - _qt_internal_add_android_deployment_multi_value_property(file_contents "qml-import-paths" - ${target} "_qt_native_qml_import_paths") - - # QML root paths - file(TO_CMAKE_PATH "${target_source_dir}" native_target_source_dir) - set_property(TARGET ${target} APPEND PROPERTY - _qt_android_native_qml_root_paths "${native_target_source_dir}") - _qt_internal_add_android_deployment_list_property(file_contents "qml-root-path" - ${target} "_qt_android_native_qml_root_paths") - # App binary string(APPEND file_contents " \"application-binary\": \"${target_output_name}\",\n") @@ -260,14 +240,9 @@ function(qt6_android_generate_deployment_settings target) " \"android-application-arguments\": \"${QT_ANDROID_APPLICATION_ARGUMENTS}\",\n") endif() - # Override qmlimportscanner binary path - set(qml_importscanner_binary_path "${QT_HOST_PATH}/${QT6_HOST_INFO_LIBEXECDIR}/qmlimportscanner") - if (WIN32) - string(APPEND qml_importscanner_binary_path ".exe") + if(COMMAND _qt_internal_generate_android_qml_deployment_settings) + _qt_internal_generate_android_qml_deployment_settings(file_contents ${target}) endif() - file(TO_CMAKE_PATH "${qml_importscanner_binary_path}" qml_importscanner_binary_path_native) - string(APPEND file_contents - " \"qml-importscanner-binary\" : \"${qml_importscanner_binary_path_native}\",\n") # Override rcc binary path _qt_internal_add_tool_to_android_deployment_settings(file_contents rcc "rcc-binary" "${target}")