diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-24 03:01:46 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-24 03:01:53 +0200 |
commit | 142831bf69b321369a25371e191a24dadd81fee1 (patch) | |
tree | c232f21d8acbc498eaddbeccb61fc812f514ffea /src/qdoc/clangcodeparser.cpp | |
parent | cfaad49b7cc69df057153cb86681556addbe6906 (diff) | |
parent | 2474c78debe48c7b81d0b4e1795342cdedfdd3a3 (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/qdoc/clangcodeparser.cpp')
-rw-r--r-- | src/qdoc/clangcodeparser.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp index bbe3f9ba7..475becf4d 100644 --- a/src/qdoc/clangcodeparser.cpp +++ b/src/qdoc/clangcodeparser.cpp @@ -1127,13 +1127,14 @@ static const char *defaultArgs_[] = { "-DQ_QDOC", "-DQ_CLANG_QDOC", "-DQT_DISABLE_DEPRECATED_BEFORE=0", - "-DQT_ANNOTATE_CLASS(type,...)=static_assert(sizeof(#__VA_ARGS__), #type);", - "-DQT_ANNOTATE_CLASS2(type,a1,a2)=static_assert(sizeof(#a1, #a2), #type);", + "-DQT_ANNOTATE_CLASS(type,...)=static_assert(sizeof(#__VA_ARGS__),#type);", + "-DQT_ANNOTATE_CLASS2(type,a1,a2)=static_assert(sizeof(#a1,#a2),#type);", "-DQT_ANNOTATE_FUNCTION(a)=__attribute__((annotate(#a)))", "-DQT_ANNOTATE_ACCESS_SPECIFIER(a)=__attribute__((annotate(#a)))", "-Wno-constant-logical-operand", "-Wno-macro-redefined", "-Wno-nullability-completeness", + "-ferror-limit=0", "-I" CLANG_RESOURCE_DIR }; @@ -1304,6 +1305,7 @@ void ClangCodeParser::buildPCH() out << line << "\n"; } } + tmpHeaderFile.close(); } if (printParsingErrors_ == 0) Location::logToStdErrAlways("clang not printing errors; include paths were guessed"); |