diff options
| author | Tim Blechmann <tim@klingt.org> | 2022-04-28 10:09:34 +0800 |
|---|---|---|
| committer | Tim Blechmann <tim@klingt.org> | 2024-02-06 01:15:40 +0000 |
| commit | 986d5395bd8542c181298faf4916ac5d6f9c6ce1 (patch) | |
| tree | 34df4883d8bb69aa3a6f9c60b42b76b9b684d538 | |
| parent | bec8df96b7615c6ce419867254027773ea7fd6b1 (diff) | |
jsruntime: silence msvc warning 4201 (nameless struct/union)
qml's private headers are pulled into binaries when using the qml
compiler. we should keep the warnings out of downstream code
Pick-to: 6.5 6.6 6.7
Change-Id: I330b5f76d7846b5f2e5f2a4c1ece95b58c67a876
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 3 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4stackframe_p.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 8279fa00f5..d15fb356c4 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -191,6 +191,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(PropertyFlags) struct PropertyAttributes { + QT_WARNING_PUSH + QT_WARNING_DISABLE_MSVC(4201) // nonstandard extension used: nameless struct/union union { uchar m_all; struct { @@ -208,6 +210,7 @@ struct PropertyAttributes uchar configurable_set : 1; }; }; + QT_WARNING_POP enum Type { Data = 0, diff --git a/src/qml/jsruntime/qv4stackframe_p.h b/src/qml/jsruntime/qv4stackframe_p.h index 2882e6eee8..f24b0b2433 100644 --- a/src/qml/jsruntime/qv4stackframe_p.h +++ b/src/qml/jsruntime/qv4stackframe_p.h @@ -36,6 +36,8 @@ struct Q_QML_EXPORT CppStackFrameBase int originalArgumentsCount; int instructionPointer; + QT_WARNING_PUSH + QT_WARNING_DISABLE_MSVC(4201) // nonstandard extension used: nameless struct/union union { struct { Value *savedStackTop; @@ -58,6 +60,7 @@ struct Q_QML_EXPORT CppStackFrameBase bool returnValueIsUndefined; }; }; + QT_WARNING_POP Kind kind; }; |