summaryrefslogtreecommitdiffstats
path: root/src/network/android
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2023-02-01 09:45:43 +0000
committerAlexandru Croitor <alexandru.croitor@qt.io>2023-02-01 16:18:55 +0000
commitd7e8d5bb1b5a9c4b21a3d824780c672eaf4e56b1 (patch)
treef20dff12fb29e6fed6a59cc734a7cb550f0906c0 /src/network/android
parent296aaf52b2031526937c1f69f2efd9cfa5490ae7 (diff)
Revert "Add support for MultiABI with custom install dir of the android-build"
This reverts commit 979a21dc4ee0c6f483c6b55e9242a153d659ab6f. Reason for revert: Caused QTBUG-110836 Task-number: QTBUG-110836 Change-Id: I4f31018954e6bb0f4e7b6db0df76d04c0a56d9b1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/network/android')
-rw-r--r--src/network/android/jar/CMakeLists.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/network/android/jar/CMakeLists.txt b/src/network/android/jar/CMakeLists.txt
index c02223fc56..d4dd9d3d89 100644
--- a/src/network/android/jar/CMakeLists.txt
+++ b/src/network/android/jar/CMakeLists.txt
@@ -13,10 +13,8 @@ qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case
OUTPUT_DIR "${QT_BUILD_DIR}/jar"
)
-qt_path_join(destination ${INSTALL_DATADIR} "jar")
-
install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case
- DESTINATION ${destination}
+ DESTINATION jar
COMPONENT Devel
)