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

Override qmlimportscanner path in android deployment settings

Browse Source 
Override the default binary path for qmlimportscanner so that it points
to the host build specified via QT_HOST_PATH.

Change-Id: Ib0b47e61315c87ce6225e2d8ca84043cae03357d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2019-08-30 14:58:57 +02:00
parent eeffac526e
commit 4670e0a1fd
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/QtPlatformAndroid.cmake
View File

@ -274,7 +274,16 @@ endif()
string(APPEND file_contents string(APPEND file_contents
" \"application-binary\": \"${target_output_name}\",\n") " \"application-binary\": \"${target_output_name}\",\n")
# Lats item in json file # Override qmlimportscanner binary path
set(qml_importscanner_binary_path "${QT_HOST_PATH}/bin/qmlimportscanner")
if (WIN32)
string(APPEND qml_importscanner_binary_path ".exe")
endif()
file(TO_NATIVE_PATH "${qml_importscanner_binary_path}" qml_importscanner_binary_path_native)
string(APPEND file_contents
" \"qml-importscanner-binary\" : \"${qml_importscanner_binary_path_native}\",\n")
# Last item in json file
# base location of stdlibc++, will be suffixed by androiddeploy qt # base location of stdlibc++, will be suffixed by androiddeploy qt
set(android_ndk_stdlib_base_path set(android_ndk_stdlib_base_path