diff options
| author | Fab Stz <fabstz-it@yahoo.fr> | 2022-10-06 13:17:18 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-16 14:53:38 +0000 |
| commit | db5f4117840af20e22fa785d8687e916956487ad (patch) | |
| tree | 493ff424791cdc429d7be5c47a43283823aa1595 | |
| parent | cf454d207afd17730c85ac50286701160fc6e80f (diff) | |
Install android jars to INSTALL_DATADIR
Task-number: QTBUG-106533
Change-Id: I5b09d882230ba6b996f5edc5ac4502d0bc004525
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 45c88ecee67e488ec1deee56d2b5227b39774f81)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/android/bluetooth/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/android/nfc/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/android/bluetooth/CMakeLists.txt b/src/android/bluetooth/CMakeLists.txt index b22c2b80..4bc44811 100644 --- a/src/android/bluetooth/CMakeLists.txt +++ b/src/android/bluetooth/CMakeLists.txt @@ -18,8 +18,10 @@ qt_internal_add_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidBluetooth OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) +qt_path_join(destination ${INSTALL_DATADIR} "jar") + install_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidBluetooth - DESTINATION jar + DESTINATION ${destination} COMPONENT Devel ) diff --git a/src/android/nfc/CMakeLists.txt b/src/android/nfc/CMakeLists.txt index 3658705d..8a8bb1f1 100644 --- a/src/android/nfc/CMakeLists.txt +++ b/src/android/nfc/CMakeLists.txt @@ -14,8 +14,10 @@ qt_internal_add_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidNfc OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) +qt_path_join(destination ${INSTALL_DATADIR} "jar") + install_jar(Qt${QtConnectivity_VERSION_MAJOR}AndroidNfc - DESTINATION jar + DESTINATION ${destination} COMPONENT Devel ) |