diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-10 18:16:00 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-10 15:42:25 +0000 |
| commit | 298413de7750ccf4fcdff15dca507ba6eb470f65 (patch) | |
| tree | 9492f3180c8f3f49a4cab35336e61b84bb968c13 /src/corelib/Qt6AndroidMacros.cmake | |
| parent | c4dbd1cddca21b5fec8b8ffdc971b895b156f33f (diff) | |
Android: use bin for instead of QT6_HOST_INFO_BINDIR
${QT6_HOST_INFO_BINDIR} is returning an empty string making
the tools paths unusable, and android apps building fails.
Partially revert 09ac1bdfc5d2ee7a537c63e54348a8cf8d905fcf.
Task-number: QTBUG-86557
Change-Id: I1522b3a4b45fbcb41894ea3bd7c714f7a79eb954
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 1bfa5eab2d..7b566a7633 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -157,7 +157,7 @@ endif() " \"application-binary\": \"${target_output_name}\",\n") # Override qmlimportscanner binary path - set(qml_importscanner_binary_path "${QT_HOST_PATH}/${QT6_HOST_INFO_BINDIR}/qmlimportscanner") + set(qml_importscanner_binary_path "${QT_HOST_PATH}/bin/qmlimportscanner") if (WIN32) string(APPEND qml_importscanner_binary_path ".exe") endif() @@ -166,7 +166,7 @@ endif() " \"qml-importscanner-binary\" : \"${qml_importscanner_binary_path_native}\",\n") # Override rcc binary path - set(rcc_binary_path "${QT_HOST_PATH}/${QT6_HOST_INFO_BINDIR}/rcc") + set(rcc_binary_path "${QT_HOST_PATH}/bin/rcc") if (WIN32) string(APPEND rcc_binary_path ".exe") endif() @@ -235,7 +235,7 @@ function(qt6_android_add_apk_target target) set(should_add_to_global_apk TRUE) endif() - set(deployment_tool "${QT_HOST_PATH}/${QT6_HOST_INFO_BINDIR}/androiddeployqt") + set(deployment_tool "${QT_HOST_PATH}/bin/androiddeployqt") set(apk_dir "$<TARGET_PROPERTY:${target},BINARY_DIR>/android-build") add_custom_target(${target}_prepare_apk_dir DEPENDS ${target} |