diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-07-01 14:08:17 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-07-01 16:08:17 +0000 |
| commit | e969141544cbd2c5adce3847d5baa9c98dcf0bc4 (patch) | |
| tree | 3dc1dc04c9303597f5674cbb9c4e8f2775eb33bd /src/linguist | |
| parent | cbd88ff4328ee43f1123c38c174f238609565513 (diff) | |
| download | qttools-e969141544cbd2c5adce3847d5baa9c98dcf0bc4.tar.gz | |
linguist: work around Clang 10 headers throwing GCC 12 -Werror=nonnull
We can't fix these 3rd-party headers, so disable the warning when
including Clang/LLVM headers.
Fixes: QTBUG-104713
Pick-to: 6.4 6.3 6.2
Change-Id: I7d851a4a4237c3d3500609d2e1f6c8ceb43f204b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/linguist')
| -rw-r--r-- | src/linguist/lupdate/clangtoolastreader.h | 1 | ||||
| -rw-r--r-- | src/linguist/lupdate/cpp_clang.h | 1 | ||||
| -rw-r--r-- | src/linguist/lupdate/lupdatepreprocessoraction.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/linguist/lupdate/clangtoolastreader.h b/src/linguist/lupdate/clangtoolastreader.h index bb8255537..45a812ab7 100644 --- a/src/linguist/lupdate/clangtoolastreader.h +++ b/src/linguist/lupdate/clangtoolastreader.h @@ -11,6 +11,7 @@ QT_WARNING_DISABLE_MSVC(4100) QT_WARNING_DISABLE_MSVC(4146) QT_WARNING_DISABLE_MSVC(4267) QT_WARNING_DISABLE_MSVC(4624) +QT_WARNING_DISABLE_GCC("-Wnonnull") #include <clang/AST/RecursiveASTVisitor.h> #include <clang/Frontend/CompilerInstance.h> diff --git a/src/linguist/lupdate/cpp_clang.h b/src/linguist/lupdate/cpp_clang.h index e16bf5d53..0f98fa98e 100644 --- a/src/linguist/lupdate/cpp_clang.h +++ b/src/linguist/lupdate/cpp_clang.h @@ -16,6 +16,7 @@ QT_WARNING_DISABLE_MSVC(4100) QT_WARNING_DISABLE_MSVC(4146) QT_WARNING_DISABLE_MSVC(4267) QT_WARNING_DISABLE_MSVC(4624) +QT_WARNING_DISABLE_GCC("-Wnonnull") #include <llvm/ADT/StringRef.h> #include <clang/Basic/SourceLocation.h> diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h index e97963e62..b1ee468d4 100644 --- a/src/linguist/lupdate/lupdatepreprocessoraction.h +++ b/src/linguist/lupdate/lupdatepreprocessoraction.h @@ -12,6 +12,7 @@ QT_WARNING_DISABLE_MSVC(4100) QT_WARNING_DISABLE_MSVC(4146) QT_WARNING_DISABLE_MSVC(4267) QT_WARNING_DISABLE_MSVC(4624) +QT_WARNING_DISABLE_GCC("-Wnonnull") #include <clang/Frontend/CompilerInstance.h> #include <clang/Frontend/FrontendActions.h> |