1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: fix indentations in Qt6AndroidMacros.cmake

Browse Source 
Change-Id: I1403101fb2ab6a25ab1a2258f9a832f706b8b547
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a8f6bad1316129467604c946c9f964d8d56b143c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia 2020-11-25 13:19:09 +02:00 committed by Qt Cherry-pick Bot
parent 9f8d8ea91b
commit a55783c81d
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/corelib/Qt6AndroidMacros.cmake
View File

@ -53,10 +53,10 @@ function(qt6_android_generate_deployment_settings target)
file(GLOB plugin_dir_files LIST_DIRECTORIES FALSE "${glob_expression}") file(GLOB plugin_dir_files LIST_DIRECTORIES FALSE "${glob_expression}")
if (NOT plugin_dir_files) if (NOT plugin_dir_files)
message(SEND_ERROR message(SEND_ERROR
"Detected Qt installation does not contain qtforandroid_${CMAKE_ANDROID_ARCH_ABI}.so in the following dir: "Detected Qt installation does not contain qtforandroid_${CMAKE_ANDROID_ARCH_ABI}.so in the following dir:"
${android_plugin_dir_path} "${android_plugin_dir_path}"
This is most likely due to the installation not being a Qt for Android build. "This is most likely due to the installation not being a Qt for Android build."
Please recheck your build configuration.") "Please recheck your build configuration.")
return() return()
else() else()
list(GET plugin_dir_files 0 android_platform_plugin_path) list(GET plugin_dir_files 0 android_platform_plugin_path)
@ -127,8 +127,7 @@ Please recheck your build configuration.")
endif() endif()
# Extra plugins # Extra plugins
get_target_property(android_extra_plugins get_target_property(android_extra_plugins ${target} QT_ANDROID_EXTRA_PLUGINS)
${target} QT_ANDROID_EXTRA_PLUGINS)
if (android_extra_plugins) if (android_extra_plugins)
list(JOIN android_extra_plugins "," android_extra_plugins) list(JOIN android_extra_plugins "," android_extra_plugins)
string(APPEND file_contents string(APPEND file_contents
@ -136,8 +135,7 @@ Please recheck your build configuration.")
endif() endif()
# Extra libs # Extra libs
get_target_property(android_extra_libs get_target_property(android_extra_libs ${target} QT_ANDROID_EXTRA_LIBS)
${target} QT_ANDROID_EXTRA_LIBS)
if (android_extra_libs) if (android_extra_libs)
list(JOIN android_extra_libs "," android_extra_libs) list(JOIN android_extra_libs "," android_extra_libs)
string(APPEND file_contents string(APPEND file_contents
@ -145,13 +143,12 @@ Please recheck your build configuration.")
endif() endif()
# package source dir # package source dir
get_target_property(android_package_source_dir get_target_property(android_package_source_dir ${target} QT_ANDROID_PACKAGE_SOURCE_DIR)
${target} QT_ANDROID_PACKAGE_SOURCE_DIR)
if (android_package_source_dir) if (android_package_source_dir)
file(TO_CMAKE_PATH "${android_package_source_dir}" android_package_source_dir_native) file(TO_CMAKE_PATH "${android_package_source_dir}" android_package_source_dir_native)
string(APPEND file_contents string(APPEND file_contents
" \"android-package-source-directory\": \"${android_package_source_dir_native}\",\n") " \"android-package-source-directory\": \"${android_package_source_dir_native}\",\n")
endif() endif()
#TODO: ANDROID_VERSION_NAME, doesn't seem to be used? #TODO: ANDROID_VERSION_NAME, doesn't seem to be used?