diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-08 17:27:52 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-08 23:47:25 +0200 |
| commit | 17ee7807e2218b84b07ac9dae4cc6ddb2381906d (patch) | |
| tree | c79a7f9560d4a96dccc5cb54e8899efbdcd36be2 | |
| parent | 44340565e89d13bcb3eb8d3807b0682c976bdde9 (diff) | |
Fix MSVC warning C4200 (zero-sized array in struct/union).
Warning C4200: nonstandard extension used : zero-sized array in
struct/union. Cannot generate copy-ctor or copy-assignment
operator when UDT contains a zero-sized array.
Change-Id: Icf23b367b88a4a4f9549cc714af2a30287027da8
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| -rw-r--r-- | src/qml/qml/qqmlbundle_p.h | 5 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 5 | ||||
| -rw-r--r-- | src/qml/qml/v4/qv4program_p.h | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlbundle_p.h b/src/qml/qml/qqmlbundle_p.h index 029acf1f1b..f09447c011 100644 --- a/src/qml/qml/qqmlbundle_p.h +++ b/src/qml/qml/qqmlbundle_p.h @@ -46,6 +46,11 @@ #include <QtCore/qstring.h> #include <QtQml/qtqmlglobal.h> +#ifdef Q_CC_MSVC +// nonstandard extension used : zero-sized array in struct/union. +# pragma warning( disable : 4200 ) +#endif + QT_BEGIN_NAMESPACE class Q_QML_EXPORT QQmlBundle diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 1e8cfb6c20..4bfe8aed1f 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -52,6 +52,11 @@ #include <ctype.h> // for toupper +#ifdef Q_CC_MSVC +// nonstandard extension used : zero-sized array in struct/union. +# pragma warning( disable : 4200 ) +#endif + Q_DECLARE_METATYPE(QJSValue) Q_DECLARE_METATYPE(QQmlV8Handle); diff --git a/src/qml/qml/v4/qv4program_p.h b/src/qml/qml/v4/qv4program_p.h index 9ac02f1e8a..3fb1670411 100644 --- a/src/qml/qml/v4/qv4program_p.h +++ b/src/qml/qml/v4/qv4program_p.h @@ -55,6 +55,11 @@ #include "qv4instruction_p.h" +#ifdef Q_CC_MSVC +// nonstandard extension used : zero-sized array in struct/union. +# pragma warning( disable : 4200 ) +#endif + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE |