diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-09-04 10:56:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-04 16:50:40 +0200 |
| commit | 87ccf530772caa5d388d97b556183fb20930ef38 (patch) | |
| tree | f3b93537b289209c8779478c6566fe8b7a93e966 /src/qml/compiler/qv4jsir_p.h | |
| parent | f9b70d89c95e792adf6331c9414962ef1673d7c1 (diff) | |
Fix qv4jsir_p.h warnings
Apparently CONST is not defined on MSVC 2010, so the unbalanced
push/pop macro usage leads to tons of such warnings:
qv4jsir_p.h(922) : warning C4602: #pragma pop_macro : 'CONST' no
previous #pragma push_macro for this identifier
Change-Id: Ia34ef00e79b4f7a3abf682e1e78dfa3193e30838
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/qml/compiler/qv4jsir_p.h')
| -rw-r--r-- | src/qml/compiler/qv4jsir_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4jsir_p.h b/src/qml/compiler/qv4jsir_p.h index 74c683b89f..1e046b83e3 100644 --- a/src/qml/compiler/qv4jsir_p.h +++ b/src/qml/compiler/qv4jsir_p.h @@ -63,6 +63,7 @@ #include <qglobal.h> #if defined(CONST) && defined(Q_OS_WIN) +# define QT_POP_CONST # pragma push_macro("CONST") # undef CONST // CONST conflicts with our own identifier #endif @@ -918,8 +919,9 @@ private: QT_END_NAMESPACE -#if defined(Q_OS_WIN) +#if defined(QT_POP_CONST) # pragma pop_macro("CONST") // Restore peace +# undef QT_POP_CONST #endif #endif // QV4IR_P_H |