diff options
| author | Hernan Martinez <hernan.c.martinez@gmail.com> | 2019-10-12 02:40:29 -0400 |
|---|---|---|
| committer | Hernan Martinez <hernan.c.martinez@gmail.com> | 2019-10-21 09:14:18 -0400 |
| commit | b61c6164c100defc519b178d73858df59cffc48d (patch) | |
| tree | 36c52d5c07704f143bfb415895da565371474fcb /src/openglextensions/qopenglextensions.cpp | |
| parent | a9dcd772c032b5cb52f86e6cd898db3d3bc81023 (diff) | |
QtGui: Disable Windows on ARM64 preprocessor conflict in QtOpenGL
The Windows API MemoryBarrier function is actually a macro when
_M_ARM64 is defined and it conflicts with the MemoryBarrier method when
it's declared and used.
Task-number: QTBUG-77388
Change-Id: I762edfc4ca1a44cbe095724de708c7cdad34ae65
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/openglextensions/qopenglextensions.cpp')
| -rw-r--r-- | src/openglextensions/qopenglextensions.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/openglextensions/qopenglextensions.cpp b/src/openglextensions/qopenglextensions.cpp index 6413ae4a78..1660181e97 100644 --- a/src/openglextensions/qopenglextensions.cpp +++ b/src/openglextensions/qopenglextensions.cpp @@ -60,6 +60,12 @@ #include "qopenglextensions.h" #include <QtGui/qopenglcontext.h> +// MemoryBarrier is a macro on some architectures on Windows +#ifdef Q_OS_WIN +#pragma push_macro("MemoryBarrier") +#undef MemoryBarrier +#endif + QT_BEGIN_NAMESPACE QAbstractOpenGLExtension::~QAbstractOpenGLExtension() @@ -7720,3 +7726,6 @@ bool QOpenGLExtension_QCOM_tiled_rendering::initializeOpenGLFunctions() QT_END_NAMESPACE +#ifdef Q_OS_WIN +#pragma pop_macro("MemoryBarrier") +#endif |