diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-19 10:36:15 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-10 08:26:57 +0100 |
| commit | c4a9429be7e0e927289abbe7a34c061df0c07628 (patch) | |
| tree | 8b313644bc0e0187144c0f87c8da9814cbaa7434 /src/plugins | |
| parent | efff8ff57a70f6de9a70e2bfda625bef86a9d6b6 (diff) | |
Fix developer build with clang-cl failing due exception spec
Clang does seem to understand __declspec(nothrow) as
used by the COM macros like STDMETHOD. Suppress the warning,
fixing errors like:
qwindowsfontenginedirectwrite.cpp(105,24): error: 'AddBeziers' is missing exception specification '__attribute__((nothrow))' [-Werror,-Wmicrosoft-exception-spec]
Task-number: QTBUG-63512
Change-Id: If582cb0c12c62a7d12c4ae702747aac1f735db3c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowscombase.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowscombase.h b/src/plugins/platforms/windows/qwindowscombase.h index 45cba9c68b..bb4b295395 100644 --- a/src/plugins/platforms/windows/qwindowscombase.h +++ b/src/plugins/platforms/windows/qwindowscombase.h @@ -107,6 +107,9 @@ private: ULONG m_ref; }; +// Clang does not consider __declspec(nothrow) as nothrow +QT_WARNING_DISABLE_CLANG("-Wmicrosoft-exception-spec") + QT_END_NAMESPACE #endif // QWINDOWSCOMBASE_H |