AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Android qml staging prefix to qml import paths

Browse Source 
Qml modules are staged to the special folder when building for android.
To make them visible we need add this folder to qml imports paths that
are used by qmlimportscanner.

Fix typo in _qt_native_qml_import_paths property name when converting
QT_QML_IMPORT_PATH property.

Pick-to: 6.2
Task-number: QTBUG-96898
Change-Id: Iaf1e06c64553e8ea27f020226095da36e1f9d881
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2021-10-27 13:28:54 +02:00
parent 3fe89eec61
commit d05da5f306
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/Qt6AndroidMacros.cmake
View File

@ -191,6 +191,15 @@ function(qt6_android_generate_deployment_settings target)
"QT_ANDROID_TARGET_SDK_VERSION" "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 ${target}
"_qt_native_qml_import_paths" "qml-import-paths")
@ -577,7 +586,7 @@ endfunction()
# properties.
function(_qt_internal_android_format_deployment_paths target)
_qt_internal_android_format_deployment_path_property(${target}
QT_QML_IMPORT_PATH _qt_android_native_qml_import_paths)
QT_QML_IMPORT_PATH _qt_native_qml_import_paths)
_qt_internal_android_format_deployment_path_property(${target}
QT_QML_ROOT_PATH _qt_android_native_qml_root_paths)