diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-10 00:07:58 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-18 11:05:12 +0000 |
| commit | b668373477cc9815d7277f8a5136da11735d8f46 (patch) | |
| tree | 4f6b9b360b5c645bdb950d33916fd6ff18d27b4a /cmake/QtModuleHelpers.cmake | |
| parent | 7acda93e64d34b16466c7e82cfd6582bae22face (diff) | |
CMake: make sure to collect Android dependencies for plugins
androiddeployqt relies on *-android-dependencies.xml files to know
what dependencies like jar files and permissions a Qt module requires.
CMake create those files under Qt prefix's lib dir but CMake was not
accounting for module plugins.
Fixes: QTBUG-90812
Change-Id: Ib3b2e2bb237159b4851ac0f23dc75f8e56af3f7a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit d6367aca869ee30e15a3861b2990baafb9972aa1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake/QtModuleHelpers.cmake')
| -rw-r--r-- | cmake/QtModuleHelpers.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtModuleHelpers.cmake b/cmake/QtModuleHelpers.cmake index 26b27bbe63..7cbad31f11 100644 --- a/cmake/QtModuleHelpers.cmake +++ b/cmake/QtModuleHelpers.cmake @@ -562,7 +562,7 @@ set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})") if (ANDROID AND NOT arg_HEADER_MODULE) # Record install library location so it can be accessed by - # qt_android_dependencies without having to specify it again. + # qt_internal_android_dependencies without having to specify it again. set_target_properties(${target} PROPERTIES QT_ANDROID_MODULE_INSTALL_DIR ${INSTALL_LIBDIR}) endif() |