feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Fix Android built-in header paths

Browse Source 
We get some Android header paths from qmake. Let's use them
as built-in headers.

Change-Id: I3b48d6dbef7127fdef3b4d8b2115c7844a0cd9cd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Ivan Donchevskii
2018-11-21 10:25:31 +01:00
parent 8d78378e5c
commit 647566c135
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -546,14 +546,14 @@ QStringList GccToolChain::gccPrepareArguments(const QStringList &flags,
for (int i = 0; i < allFlags.size(); ++i) { for (int i = 0; i < allFlags.size(); ++i) {
const QString &flag = allFlags.at(i); const QString &flag = allFlags.at(i);
if (flag.startsWith("-stdlib=") || flag.startsWith("--gcctoolchain=") if (flag.startsWith("-stdlib=") || flag.startsWith("--gcctoolchain=")
|| flag.startsWith("-B")) { || flag.startsWith("-B") || (flag.startsWith("-isystem") && flag.length() > 8)) {
arguments << flag; arguments << flag;
} else if (!hasKitSysroot) { } else if (!hasKitSysroot) {
// pass build system's sysroot to compiler, if we didn't pass one from kit // pass build system's sysroot to compiler, if we didn't pass one from kit
if (flag.startsWith("--sysroot=")) { if (flag.startsWith("--sysroot=")) {
arguments << flag; arguments << flag;
} else if ((flag.startsWith("-isysroot") || flag.startsWith("--sysroot") } else if ((flag.startsWith("-isysroot") || flag.startsWith("--sysroot")
|| flag == "-target" || flag == "-gcc-toolchain") || flag == "-target" || flag == "-gcc-toolchain" || flag == "-isystem")
&& i < flags.size() - 1) { && i < flags.size() - 1) {
arguments << flag << allFlags.at(i + 1); arguments << flag << allFlags.at(i + 1);
++i; ++i;