diff options
| author | Dmitrii Kolpakov <kolpakov@rutoken.ru> | 2022-04-04 14:29:35 +0300 |
|---|---|---|
| committer | Dmitrii Kolpakov <kolpakov@rutoken.ru> | 2022-04-06 07:05:07 +0000 |
| commit | 2d85e7fd52a2897d43fd351eb202d5bd8213490e (patch) | |
| tree | 567542ac27a9048bbf68ad6160e28943ab9782e3 | |
| parent | 66c67898456c4f599e48d5466022d49b044f679d (diff) | |
| download | qbs-2d85e7fd52a2897d43fd351eb202d5bd8213490e.tar.gz | |
Fix build for android when the project has file named "version"
The assembly for android breaks when there is a "version" file in the
root folder of the project.
Fixes: QBS-1691
Change-Id: Ie86d23618dff5fa0e28cbf3b756133df5751160f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/cpp/android-gcc.qbs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs index 8f0e4c905..aded485cd 100644 --- a/share/qbs/modules/cpp/android-gcc.qbs +++ b/share/qbs/modules/cpp/android-gcc.qbs @@ -128,7 +128,7 @@ LinuxGCC { // When using ndk r19c, llvm doesn't add sysroot/usr/include/c++/v1 to the path // But it works starting with ndk r20b systemIncludePaths: (Utilities.versionCompare(Android.ndk.version, "20") < 0) ? - FileInfo.joinPaths(sysroot, "usr", "include", "c++", "v1") : "" + FileInfo.joinPaths(sysroot, "usr", "include", "c++", "v1") : [] defines: ["ANDROID", "__ANDROID__"] |