diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-30 14:58:57 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-30 13:12:59 +0000 |
| commit | 4670e0a1fddc8c249b43f5fd680fdb84a3cdbca1 (patch) | |
| tree | b17dfceb2eaa3a7a097d41496311750254d3f1d7 /cmake/QtPlatformAndroid.cmake | |
| parent | eeffac526ead99175125421f4f83356113460eaa (diff) | |
Override qmlimportscanner path in android deployment settings
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>
Diffstat (limited to 'cmake/QtPlatformAndroid.cmake')
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index c9deae49e3..cb335da831 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -274,7 +274,16 @@ endif() string(APPEND file_contents " \"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 set(android_ndk_stdlib_base_path |