diff options
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
-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") |