diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-04-02 12:35:59 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-04-02 15:36:43 +0200 |
| commit | 73577b33f3c62d3558d3e6e4fb275e6c2022bc1c (patch) | |
| tree | 2f02859d127389c9ba20028597087c81a63f0a20 | |
| parent | 41327df2a93e8baca94e9e8a858d0aeb15105d50 (diff) | |
profileevaluator: do not add sysroot if the result does not exist
Required for Qt paths in includes on ios.
Task-number: QTCREATORBUG-11908
Change-Id: Ic56c81812d13e3d6f6acb31d59c1ff7c7048aeff
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
| -rw-r--r-- | src/shared/proparser/profileevaluator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp index bb781a50a5..024dbb52fc 100644 --- a/src/shared/proparser/profileevaluator.cpp +++ b/src/shared/proparser/profileevaluator.cpp @@ -100,7 +100,8 @@ QString ProFileEvaluator::sysrootify(const QString &path, const QString &baseDir #endif const bool isHostSystemPath = option->sysroot.isEmpty() || path.startsWith(option->sysroot, cs) - || path.startsWith(baseDir, cs) || path.startsWith(d->m_outputDir, cs); + || path.startsWith(baseDir, cs) || path.startsWith(d->m_outputDir, cs) + || !QFileInfo(option->sysroot + path).exists(); return isHostSystemPath ? path : option->sysroot + path; } |