Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I43a657af3d3c5853bd062f14e3b96b87cdadea94

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");