diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-02-01 17:53:58 +0000 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2023-03-08 15:02:35 +0100 |
| commit | 9db5ca87897340873a4606c651a37e0356e8f1a0 (patch) | |
| tree | 6c6be8596d6a4a91f3afefe83f80bc175e9c99cc /mkspecs | |
| parent | 9065391570721283fe5ac46480c6cf6906d21333 (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>
(cherry picked from commit 871f7a05db4b152387c563be519cf3426a9b249e)
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index d56d79960c..8d68defa97 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -8,6 +8,11 @@ contains(TEMPLATE, ".*app"):!build_pass { FILE_CONTENT += " \"description\": \"This file is generated by qmake to be read by androiddeployqt and should not be modified by hand.\"," FILE_CONTENT += " \"qt\": $$emitString($$[QT_INSTALL_PREFIX])," + FILE_CONTENT += " \"qtDataDirectory\": $$emitString($$relative_path($$[QT_INSTALL_DATA], $$[QT_INSTALL_PREFIX]))," + FILE_CONTENT += " \"qtLibExecsDirectory\": $$emitString($$relative_path($$[QT_INSTALL_LIBEXECS], $$[QT_INSTALL_PREFIX]))," + FILE_CONTENT += " \"qtLibsDirectory\": $$emitString($$relative_path($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]))," + FILE_CONTENT += " \"qtPluginsDirectory\": $$emitString($$relative_path($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]))," + FILE_CONTENT += " \"qtQmlDirectory\": $$emitString($$relative_path($$[QT_INSTALL_QML], $$[QT_INSTALL_PREFIX]))," # Settings from mkspecs/environment FILE_CONTENT += " \"sdk\": $$emitString($$ANDROID_SDK_ROOT)," |