diff options
author | Martin Smith <martin.smith@qt.io> | 2018-11-27 15:22:25 +0100 |
---|---|---|
committer | Martin Smith <martin.smith@qt.io> | 2018-11-28 08:52:54 +0000 |
commit | cf10f8044c18e20856e85aec46180c66398040a7 (patch) | |
tree | 1900a7d5ddefe3faa4f302328d2a7be6d34984ae /src/qdoc/clangcodeparser.cpp | |
parent | 6ea96cfb61a619583555cf301994f32cbc75a4d8 (diff) | |
download | qttools-cf10f8044c18e20856e85aec46180c66398040a7.tar.gz |
qdoc: Correct clang resource path argument
The construction of this argument had been modified incorrectly.
This update corrects it.
Change-Id: I59dc6cc0e5b12fd347f778ea4fc78e00d9c42d89
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/qdoc/clangcodeparser.cpp')
-rw-r--r-- | src/qdoc/clangcodeparser.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp index e3ebece2e..acc3f2446 100644 --- a/src/qdoc/clangcodeparser.cpp +++ b/src/qdoc/clangcodeparser.cpp @@ -1105,7 +1105,8 @@ static const char *defaultArgs_[] = { "-DQT_ANNOTATE_ACCESS_SPECIFIER(a)=__attribute__((annotate(#a)))", "-Wno-constant-logical-operand", "-Wno-macro-redefined", - "-Wno-nullability-completeness" + "-Wno-nullability-completeness", + "-I" CLANG_RESOURCE_DIR }; static QByteArray clangResourcePath = "-I"; @@ -1117,8 +1118,6 @@ void ClangCodeParser::getDefaultArgs() { args_.clear(); args_.insert(args_.begin(), std::begin(defaultArgs_), std::end(defaultArgs_)); - clangResourcePath += CLANG_RESOURCE_DIR; - args_.push_back(clangResourcePath.data()); // Add the defines from the qdocconf file. for (const auto &p : qAsConst(defines_)) args_.push_back(p.constData()); |