diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-02-01 09:46:00 +0000 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-02-01 09:49:41 +0000 |
commit | d6e900d9bc65ec94b524b2f60c57503f07ad23d1 (patch) | |
tree | c761a48adf2180e1b6e673026c3580f374cbbd64 /mkspecs | |
parent | 284d4204489977d2f08fa704642fd9b11d572c4c (diff) |
Revert "Add support for MultiABI with custom install dir of the android-build"
This reverts commit 474ad27c63afcb073d24c22a616c8e53bb45987a.
Reason for revert: Caused QTBUG-110836
Task-number: QTBUG-110836
Change-Id: I28d4b2aefbe3632d1ef665200edf85d8047eb198
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 8d68defa97..d56d79960c 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -8,11 +8,6 @@ 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)," |