diff options
| author | Raphaël Cotty <raphael.cotty@gmail.com> | 2021-01-26 07:38:20 +0100 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2021-01-29 06:44:25 +0000 |
| commit | 9a45ce1b66cddbf09801527c05457bcc994ee96e (patch) | |
| tree | 4100097dd2eb80389dd7b3a57d33e22429a57c74 | |
| parent | 65d5d52b150bb685a6fe32e4c88f661cf98743b6 (diff) | |
Android: Conditionnally depends on cpp remove old fix
Cpp module is not required when used in the aggregate in multi-arch mode.
Only define "ANDROID_HAS_WSTRING" for Qt < 5.14.0
Change-Id: Ibb0ed6f23352466ec703c96488233eda1940daad
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/android_support.qbs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/share/qbs/module-providers/Qt/templates/android_support.qbs b/share/qbs/module-providers/Qt/templates/android_support.qbs index 3790037f3..a0eb9ef41 100644 --- a/share/qbs/module-providers/Qt/templates/android_support.qbs +++ b/share/qbs/module-providers/Qt/templates/android_support.qbs @@ -38,7 +38,7 @@ Module { Depends { name: "Android.sdk"; condition: _enableSdkSupport } Depends { name: "Android.ndk"; condition: _enableNdkSupport } Depends { name: "java"; condition: _enableSdkSupport } - Depends { name: "cpp" } + Depends { name: "cpp"; condition: _enableNdkSupport } Properties { condition: _enableNdkSupport && qbs.toolchain.contains("clang") @@ -62,8 +62,10 @@ Module { condition: _enableSdkSupport && Utilities.versionCompare(version, "6.0") >= 0 java.additionalClassPaths: [FileInfo.joinPaths(_qtInstallDir, "jar", "Qt6Android.jar")] } + // "ANDROID_HAS_WSTRING" was removed from qtcore qstring.h in Qt 5.14.0 Properties { - condition: _enableNdkSupport && (Android.ndk.abi === "armeabi-v7a" || Android.ndk.abi === "x86") + condition: _enableNdkSupport && Utilities.versionCompare(version, "5.14.0") < 0 && + (Android.ndk.abi === "armeabi-v7a" || Android.ndk.abi === "x86") cpp.defines: "ANDROID_HAS_WSTRING" } Properties { @@ -78,7 +80,11 @@ Module { condition: _enableSdkSupport && Utilities.versionCompare(version, "6.0") >= 0 Android.sdk.minimumVersion: "23" } - cpp.archSuffix: _multiAbi ? "_" + Android.ndk.abi : "" + + Properties { + condition: _enableNdkSupport + cpp.archSuffix: _multiAbi ? "_" + Android.ndk.abi : "" + } Rule { condition: _enableSdkSupport |