diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:30:54 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-06-09 17:30:54 +0300 |
| commit | da6e958319e95fe564d3b30c931492dd666bfaff (patch) | |
| tree | 16ac1556a573daeba5c9c4b795f86aa166ffe467 /src/corelib/global/qcompilerdetection.h | |
| parent | 29400a683f96867133b28299c0d0bd6bcf40df35 (diff) | |
| parent | a96fc76fa78f3500266b3a34016f9e1bd29b319c (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.11' into tqtc/lts-5.15-opensourcev5.15.11-lts-lgpl
Change-Id: Iac056a5e9f59fc8d1929171c18039aeb45be22b8
Diffstat (limited to 'src/corelib/global/qcompilerdetection.h')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index d8a44655dd..d759548fbc 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1259,7 +1259,11 @@ * "Weak overloads" - makes an otherwise confliciting overload weaker * (by making it a template) */ -#define Q_WEAK_OVERLOAD template <typename = void> +#ifndef Q_CLANG_QDOC +# define Q_WEAK_OVERLOAD template <typename = void> +#else +# define Q_WEAK_OVERLOAD +#endif /* * Warning/diagnostic handling |