diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-25 01:00:16 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-25 01:00:16 +0200 |
| commit | 375efdd0e157a80de08627612e36597a22c6ac06 (patch) | |
| tree | 493209a04e60a8ccc9c2e551637db8cec1c92f0a /src/gui/opengl/qopenglversionfunctions.h | |
| parent | 9ae0fa4d4977ef1eb28eff2f95b429e9455ba748 (diff) | |
| parent | 5edf34848a51c7678031aeb9576b8f3b7b5fceab (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Iebedaa967a263854f18cd403ce007d7965f26d2b
Diffstat (limited to 'src/gui/opengl/qopenglversionfunctions.h')
| -rw-r--r-- | src/gui/opengl/qopenglversionfunctions.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/opengl/qopenglversionfunctions.h b/src/gui/opengl/qopenglversionfunctions.h index aa6e49b9ae..4835ea4871 100644 --- a/src/gui/opengl/qopenglversionfunctions.h +++ b/src/gui/opengl/qopenglversionfunctions.h @@ -61,6 +61,12 @@ #include <QtCore/qpair.h> #include <QtGui/qopengl.h> +// MemoryBarrier is a macro on some architectures on Windows +#ifdef Q_OS_WIN +#pragma push_macro("MemoryBarrier") +#undef MemoryBarrier +#endif + QT_BEGIN_NAMESPACE class QOpenGLContext; @@ -1897,6 +1903,10 @@ public: QT_END_NAMESPACE +#ifdef Q_OS_WIN +#pragma pop_macro("MemoryBarrier") +#endif + #endif // QT_NO_OPENGL #endif |