diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-09 20:16:01 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-11 10:19:03 +0000 |
| commit | dc34954d4c3700ee4e78b9707ce45b31d5f4331b (patch) | |
| tree | 59c4457abcb317c0eda1797c937cc23125e7e6bb /src/corelib | |
| parent | 69e0205bcb29adf5cf0a1c978f1f11514356a3fc (diff) | |
CMake: always pass QT6_INSTALL_PREFIX to androiddeployqt
Qt CMake uses a fake_prefix as install dir when running tests instead of
the main qt install path, this will throw androiddeployqt off since it
expects the real qt install path which has gradle and java sources.
Fixes: QTBUG-88579
Change-Id: I6580470840ae14d4a4a68a95f217b30408d7ab44
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 0d42f4df9275897d708ee01ed879ac185aab7360)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 3bb96d0c8c..a71163d9f7 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -45,7 +45,7 @@ function(qt6_android_generate_deployment_settings target) string(APPEND file_contents " \"description\": \"This file is generated by cmake to be read by androiddeployqt and should not be modified by hand.\",\n") - # Host Qt Android install path + # Host Qt Android install path if (NOT QT_BUILDING_QT OR QT_STANDALONE_TEST_PATH) set(qt_path "${QT6_INSTALL_PREFIX}") set(android_plugin_dir_path "${qt_path}/${QT6_INSTALL_PLUGINS}/platforms") @@ -62,12 +62,9 @@ function(qt6_android_generate_deployment_settings target) list(GET plugin_dir_files 0 android_platform_plugin_path) message(STATUS "Found android platform plugin at: ${android_platform_plugin_path}") endif() - set(qt_android_install_dir "${qt_path}") - else() - # Building from source, use the same install prefix. - set(qt_android_install_dir "${CMAKE_INSTALL_PREFIX}") endif() + set(qt_android_install_dir "${QT6_INSTALL_PREFIX}") file(TO_CMAKE_PATH "${qt_android_install_dir}" qt_android_install_dir_native) string(APPEND file_contents " \"qt\": \"${qt_android_install_dir_native}\",\n") |