summaryrefslogtreecommitdiffstats
path: root/src/android/java
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2023-02-01 17:53:58 +0000
committerAlexey Edelev <alexey.edelev@qt.io>2023-02-02 19:03:36 +0100
commit871f7a05db4b152387c563be519cf3426a9b249e (patch)
tree6fd677280ab1c23bc545e95af72a07e6012e28fa /src/android/java
parentfd65f709748a7026428cc3a8828784cbb8421a03 (diff)
Revert "Revert "Add support for MultiABI with custom install dir of the android-build""
This reverts commit d7e8d5bb1b5a9c4b21a3d824780c672eaf4e56b1. Reason for revert: Found a working solution for the issue. Change-Id: Ia720cc63ece9dfb1a24067cdd9c3d79d4edbe3be Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/android/java')
-rw-r--r--src/android/java/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/java/CMakeLists.txt b/src/android/java/CMakeLists.txt
index 8f0c0da542..598e374a03 100644
--- a/src/android/java/CMakeLists.txt
+++ b/src/android/java/CMakeLists.txt
@@ -48,7 +48,7 @@ add_custom_target(Qt${QtBase_VERSION_MAJOR}AndroidBindings
${strings_resouces}
)
-qt_path_join(destination ${QT_INSTALL_DIR} "src/android/java")
+qt_path_join(destination ${QT_INSTALL_DIR} ${INSTALL_DATADIR} "src/android/java")
qt_copy_or_install(DIRECTORY ${resource_directories}
DESTINATION "${destination}"