diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:32 +0200 |
| commit | 7b3bdcbfe8a920c4c156e91324eb0b374533d42c (patch) | |
| tree | 726ee71fc1be50cdda04cdc88a1447599f9d74ae /src/gui/opengl/qopenglversionfunctions.h | |
| parent | dff3843d98d52e2c32fea07371f91117de0667e9 (diff) | |
| parent | 9d504e1150e4bd49d34aba5cee938d1fd9f7e80c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I379794a01cbf6fb39d94b24cc8c90b1971a212b9
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 |