diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-02-01 09:45:43 +0000 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-02-01 16:18:55 +0000 |
| commit | d7e8d5bb1b5a9c4b21a3d824780c672eaf4e56b1 (patch) | |
| tree | f20dff12fb29e6fed6a59cc734a7cb550f0906c0 /src/android/templates | |
| parent | 296aaf52b2031526937c1f69f2efd9cfa5490ae7 (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/android/templates')
| -rw-r--r-- | src/android/templates/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/templates/CMakeLists.txt b/src/android/templates/CMakeLists.txt index b3728968fb..3eba4611e8 100644 --- a/src/android/templates/CMakeLists.txt +++ b/src/android/templates/CMakeLists.txt @@ -18,7 +18,7 @@ add_custom_target(Qt${QtBase_VERSION_MAJOR}AndroidTemplates "${CMAKE_CURRENT_SOURCE_DIR}/res/values/libs.xml" ) -qt_path_join(destination ${QT_INSTALL_DIR} ${INSTALL_DATADIR} "src/android/templates") +qt_path_join(destination ${QT_INSTALL_DIR} "src/android/templates") qt_copy_or_install(FILES ${template_files} DESTINATION "${destination}") |