diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2019-12-10 12:05:05 +0100 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2019-12-10 14:25:03 +0100 |
| commit | c35149b1bcc3956ca0b3a9c8e3c961df8142cf2e (patch) | |
| tree | 862db8f56964c3da4dbecd94bc692895798f59b8 | |
| parent | 6b9638e4b3f6f7db2a457ed44ec08371969fe7db (diff) | |
| download | qttools-c35149b1bcc3956ca0b3a9c8e3c961df8142cf2e.tar.gz | |
qdoc: Avoid errors related to PCH usage
This is a partial cherry-pick of commit 6a5fb1ef, originally merged to
5.13 branch.
Remove whitespace from the default parameters passed to Clang, and add
'-ferror-limit=0' to disable the error limit. This helps to ensure we
get a usable precompiled header on all platforms.
Fixes: QTBUG-75511
(cherry picked from commit 6a5fb1ef73fc7a917efe3670fcdfa7aa6e09df86)
Change-Id: Ib7ea8f5be17d0ccddfd1fadf855cad9a7d9f4481
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | src/qdoc/clangcodeparser.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qdoc/clangcodeparser.cpp b/src/qdoc/clangcodeparser.cpp index 330697082..f658c14ad 100644 --- a/src/qdoc/clangcodeparser.cpp +++ b/src/qdoc/clangcodeparser.cpp @@ -1095,14 +1095,15 @@ static const char *defaultArgs_[] = { "-fno-exceptions", // Workaround for clang bug http://reviews.llvm.org/D17988 "-DQ_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", #ifdef Q_OS_WIN "-fms-compatibility-version=19", #endif + "-ferror-limit=0", "-I" CLANG_RESOURCE_DIR }; |