diff options
Diffstat (limited to 'mkspecs/features/android')
| -rw-r--r-- | mkspecs/features/android/android.prf | 8 | ||||
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 36 | ||||
| -rw-r--r-- | mkspecs/features/android/default_pre.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/android/sdk.prf | 2 |
4 files changed, 31 insertions, 17 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf index 7f7fec85f7..87fdd763e4 100644 --- a/mkspecs/features/android/android.prf +++ b/mkspecs/features/android/android.prf @@ -42,11 +42,13 @@ build_pass|if(single_android_abi:!single_arch) { INSTALLS *= target } } - } else: contains(TEMPLATE, "lib"):!static:!QTDIR_build:android_install { + } else: contains(TEMPLATE, "lib"):!QTDIR_build:android_install { tmpvar = $$str_member($$TARGET, -$$str_size($${QT_ARCH}), -1) !equals(tmpvar, $${QT_ARCH}): TARGET = $${TARGET}_$${QT_ARCH} - target.path = /libs/$$ANDROID_TARGET_ARCH/ - INSTALLS *= target + !static { + target.path = /libs/$$ANDROID_TARGET_ARCH/ + INSTALLS *= target + } } } else { android-build-distclean.commands = \ diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 037dc23772..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)," @@ -62,23 +67,32 @@ contains(TEMPLATE, ".*app"):!build_pass { !isEmpty(ANDROID_EXTRA_LIBS): \ FILE_CONTENT += " \"android-extra-libs\": $$emitString($$join(ANDROID_EXTRA_LIBS, ","))," - FILE_CONTENT += " \"qml-importscanner-binary\": $$emitString($$[QT_HOST_LIBEXECS]/qmlimportscanner)," - FILE_CONTENT += " \"rcc-binary\": $$emitString($$[QT_HOST_LIBEXECS]/rcc)," + tool_extension = "" + contains(QMAKE_HOST.os, Windows): tool_extension = ".exe" + FILE_CONTENT += " \"rcc-binary\": $$emitString($$[QT_HOST_LIBEXECS]/rcc$${tool_extension})," - qml_import_paths = $$(QML2_IMPORT_PATH) - qml_import_paths = $$split(qml_import_paths, $$DIRLIST_SEPARATOR) - qml_import_paths += $$QML_IMPORT_PATH - !isEmpty(qml_import_paths) { - FILE_CONTENT += " \"qml-import-paths\": $$emitString($$join(qml_import_paths, ","))," + contains(QT_MODULES, qml) { + FILE_CONTENT += " \"qml-importscanner-binary\": $$emitString($$[QT_HOST_LIBEXECS]/qmlimportscanner$${tool_extension})," + + qml_import_paths = $$(QML2_IMPORT_PATH) + qml_import_paths = $$split(qml_import_paths, $$DIRLIST_SEPARATOR) + qml_import_paths += $$QML_IMPORT_PATH + !isEmpty(qml_import_paths) { + FILE_CONTENT += " \"qml-import-paths\": $$emitString($$join(qml_import_paths, ","))," + } + unset(qml_import_paths) + + + isEmpty(QML_ROOT_PATH): \ + QML_ROOT_PATH = $$_PRO_FILE_PWD_ + FILE_CONTENT += " \"qml-root-path\": $$emitString($$QML_ROOT_PATH)," + } else { + FILE_CONTENT += " \"qml-skip-import-scanning\": true," } - unset(qml_import_paths) !isEmpty(ANDROID_APPLICATION_ARGUMENTS): \ FILE_CONTENT += " \"android-application-arguments\": $$emitString($$ANDROID_APPLICATION_ARGUMENTS)," - isEmpty(QML_ROOT_PATH): \ - QML_ROOT_PATH = $$_PRO_FILE_PWD_ - FILE_CONTENT += " \"qml-root-path\": $$emitString($$QML_ROOT_PATH)," FILE_CONTENT += " \"stdcpp-path\": $$emitString($$ANDROID_STDCPP_PATH)," !isEmpty(RESOURCES)|!isEmpty(QMLCACHE_RESOURCE_FILES) { # Make sure that qmake generated qrc files are accounted for diff --git a/mkspecs/features/android/default_pre.prf b/mkspecs/features/android/default_pre.prf index 9f90dcb391..2328b728ac 100644 --- a/mkspecs/features/android/default_pre.prf +++ b/mkspecs/features/android/default_pre.prf @@ -76,8 +76,6 @@ else: equals(QT_ARCH, x86_64): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/x86_64-linux- else: equals(QT_ARCH, arm64-v8a): CROSS_COMPILE = $$NDK_LLVM_PATH/bin/aarch64-linux-android- else: CROSS_COMPILE = $$NDK_LLVM_PATH/bin/arm-linux-androideabi- -QMAKE_RANLIB = $${CROSS_COMPILE}ranlib -QMAKE_LINK_SHLIB = $$QMAKE_LINK QMAKE_LFLAGS = QMAKE_LIBS_PRIVATE = -llog -lz -lm -ldl -lc diff --git a/mkspecs/features/android/sdk.prf b/mkspecs/features/android/sdk.prf index 83428ae7d7..252c234e33 100644 --- a/mkspecs/features/android/sdk.prf +++ b/mkspecs/features/android/sdk.prf @@ -1,6 +1,6 @@ API_VERSION_TO_USE = $$(ANDROID_API_VERSION) isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION -isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-31 +isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-33 ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar !exists($$ANDROID_JAR_FILE) { |