From 647566c135bc2693bc486e7b23567870cc194e4b Mon Sep 17 00:00:00 2001 From: Ivan Donchevskii Date: Wed, 21 Nov 2018 10:25:31 +0100 Subject: [PATCH] ProjectExplorer: Fix Android built-in header paths We get some Android header paths from qmake. Let's use them as built-in headers. Change-Id: I3b48d6dbef7127fdef3b4d8b2115c7844a0cd9cd Reviewed-by: Tobias Hunger --- src/plugins/projectexplorer/gcctoolchain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 3a1c39b8d7f..10102a794f1 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -546,14 +546,14 @@ QStringList GccToolChain::gccPrepareArguments(const QStringList &flags, for (int i = 0; i < allFlags.size(); ++i) { const QString &flag = allFlags.at(i); if (flag.startsWith("-stdlib=") || flag.startsWith("--gcctoolchain=") - || flag.startsWith("-B")) { + || flag.startsWith("-B") || (flag.startsWith("-isystem") && flag.length() > 8)) { arguments << flag; } else if (!hasKitSysroot) { // pass build system's sysroot to compiler, if we didn't pass one from kit if (flag.startsWith("--sysroot=")) { arguments << flag; } else if ((flag.startsWith("-isysroot") || flag.startsWith("--sysroot") - || flag == "-target" || flag == "-gcc-toolchain") + || flag == "-target" || flag == "-gcc-toolchain" || flag == "-isystem") && i < flags.size() - 1) { arguments << flag << allFlags.at(i + 1); ++i;