From d24536bbd55eca001a4933d88450edb193b0e272 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Fri, 7 Mar 2014 13:56:01 +0100 Subject: Expose "android-extra-plugins" androiddeployqt feature to qmake Makes it possible to use "android-extra-plugins" from qmake through the ANDROID_EXTRA_PLUGINS variable. Change-Id: I7c67e9f104e5397e094afff730efccb91949caa2 Reviewed-by: Oswald Buddenhagen Reviewed-by: Eskil Abrahamsen Blomfeldt --- mkspecs/features/android/android_deployment_settings.prf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mkspecs/features/android/android_deployment_settings.prf') diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 5bc1fd14c9..2d40b13d63 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -39,10 +39,14 @@ contains(TEMPLATE, ".*app"):!build_pass:!android-no-sdk { isEmpty(ANDROID_TARGET_ARCH): ANDROID_TARGET_ARCH = $$DEFAULT_ANDROID_TARGET_ARCH FILE_CONTENT += " \"target-architecture\": $$emitString($$ANDROID_TARGET_ARCH)," - # Explicitly set dependencies of application for deployment + # Explicitly set qt dependencies of application for deployment !isEmpty(ANDROID_DEPLOYMENT_DEPENDENCIES): \ FILE_CONTENT += " \"deployment-dependencies\": $$emitString($$join(ANDROID_DEPLOYMENT_DEPENDENCIES, ","))," + # Explicitly set external dependencies of application for deployment + !isEmpty(ANDROID_EXTRA_PLUGINS): \ + FILE_CONTENT += " \"android-extra-plugins\": $$emitString($$join(ANDROID_EXTRA_PLUGINS, ","))," + # Android-specific settings of Project !isEmpty(ANDROID_PACKAGE_SOURCE_DIR): \ FILE_CONTENT += " \"android-package-source-directory\": $$emitString($$ANDROID_PACKAGE_SOURCE_DIR)," -- cgit v1.2.3