From 7d4baabdaefdc20cc7df6314230916477c76e7ff Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Sun, 2 Aug 2020 20:19:49 +0200 Subject: Android: Install the qmldir files when configuring for a single abi This amends 0ef46b41d86b9fad4fc4a18bd577d208afa1fce8 to ensure the new configuration is styled correctly for qmake. Task-number: QTBUG-80938 Change-Id: Iebfff3ff0570d2e92d01d4eb1178c0d6261468f9 Pick-to: 5.15 Reviewed-by: Lars Schmertmann Reviewed-by: Alexandru Croitor --- mkspecs/features/android/resolve_config.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/features/android/resolve_config.prf') diff --git a/mkspecs/features/android/resolve_config.prf b/mkspecs/features/android/resolve_config.prf index 14749abcc0..f4ccd88e31 100644 --- a/mkspecs/features/android/resolve_config.prf +++ b/mkspecs/features/android/resolve_config.prf @@ -1,6 +1,6 @@ load(resolve_config) -!equals(TEMPLATE, aux):!host_build:!single_arch:!java:!singleAndroidAbi:android { +!equals(TEMPLATE, aux):!host_build:!single_arch:!java:!single_android_abi:android { isEmpty(ANDROID_ABIS): ANDROID_ABIS = $$ALL_ANDROID_ABIS ALL_ABIS = $$join(ANDROID_ABIS, _and_) -- cgit v1.2.3