diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 16:43:14 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-04-24 16:43:14 +0300 |
| commit | 29400a683f96867133b28299c0d0bd6bcf40df35 (patch) | |
| tree | b616dfb91ce111d61a34a67b28069561306575da /src/dbus/qdbuserror.cpp | |
| parent | 42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4 (diff) | |
| parent | 9c60c8b122e5eb74fe74e11b929c30aa19ec0dd3 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl
Change-Id: Ic1bb4240ca70a8a361fa0267476707446579221d
Diffstat (limited to 'src/dbus/qdbuserror.cpp')
| -rw-r--r-- | src/dbus/qdbuserror.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/dbus/qdbuserror.cpp b/src/dbus/qdbuserror.cpp index decd345ece..37a147eb02 100644 --- a/src/dbus/qdbuserror.cpp +++ b/src/dbus/qdbuserror.cpp @@ -354,12 +354,16 @@ QDebug operator<<(QDebug dbg, const QDBusError &msg) QT_END_NAMESPACE +#ifndef QT_BOOTSTRAPPED +#include "moc_qdbuserror.cpp" +#endif + #endif // QT_NO_DBUS /* MSVC2015 has the warning C4503 at the end of the file: QtPrivate::StaticStringBuilder<QtPrivate::IndexesList<...> - decorated name length exceeded, name was truncated -It is used by qOffsetStringArray in a constexpr evaulation and this code does not exist in the object file, +It is used by qOffsetStringArray in a constexpr evaluation and this code does not exist in the object file, but we still have the warning or even error with -WX flag */ QT_WARNING_DISABLE_MSVC(4503) |