diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-08-02 20:19:49 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-08-03 16:47:31 +0200 |
| commit | 7d4baabdaefdc20cc7df6314230916477c76e7ff (patch) | |
| tree | 5cb0052b44ddc1555e74e94e034f2dd04761d575 /mkspecs/features/android | |
| parent | 3f2251994d7a22978a7c64ce7719471e6f36cc3a (diff) | |
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 <lars.schmertmann@governikus.de>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'mkspecs/features/android')
| -rw-r--r-- | mkspecs/features/android/default_pre.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/android/resolve_config.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/android/default_pre.prf b/mkspecs/features/android/default_pre.prf index f7383c386c..eaa2b0c666 100644 --- a/mkspecs/features/android/default_pre.prf +++ b/mkspecs/features/android/default_pre.prf @@ -10,7 +10,7 @@ build_pass:armeabi-v7a { QT_ARCH = x86_64 } else:count(ALL_ANDROID_ABIS, 1) { QT_ARCH = $$ALL_ANDROID_ABIS - CONFIG += singleAndroidAbi $$QT_ARCH + CONFIG += single_android_abi $$QT_ARCH } else { # default architecture QT_ARCH = arm64-v8a 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_) |