summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2019-05-24 14:46:39 +0200
committerTopi Reinio <topi.reinio@qt.io>2019-05-24 14:49:23 +0200
commit326463142b42b03c0e4c59069e099d6fd27212ce (patch)
treef7b622fb26ee1f8a4692c392f93e4abfecbaa7d6
parente363e6400afaa4ddc691bfb5796efd34ecd4f4a8 (diff)
qdoc: Drop '-I' prefix from module header pathv5.13.0-rc1
Under certain conditions the '-I' prefixes survive in the list of resolved include paths. Fixes: QTBUG-76026 Change-Id: Ie3543b5aa8b88d8021175b3168ab8de8a4497878 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/qdoc/clangcodeparser.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp
index 5bda5296b..87c9282ce 100644
--- a/src/qdoc/clangcodeparser.cpp
+++ b/src/qdoc/clangcodeparser.cpp
@@ -1226,6 +1226,8 @@ void ClangCodeParser::buildPCH()
for (const auto &p : qAsConst(includePaths_)) {
if (p.endsWith(module)) {
QByteArray candidate = p + "/" + module;
+ if (p.startsWith("-I"))
+ candidate = candidate.mid(2);
if (QFile::exists(QString::fromUtf8(candidate))) {
header = candidate;
break;