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 /mkspecs/features/android/android_deployment_settings.prf | |
| 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 'mkspecs/features/android/android_deployment_settings.prf')
| -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)," |