From 73577b33f3c62d3558d3e6e4fb275e6c2022bc1c Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@digia.com>
Date: Wed, 2 Apr 2014 12:35:59 +0200
Subject: [PATCH] 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>
---
src/shared/proparser/profileevaluator.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/shared/proparser/profileevaluator.cpp b/src/shared/proparser/profileevaluator.cpp
index bb781a50a5a..024dbb52fc6 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;
}
--
GitLab