diff options
| author | Qt Forward Merge Bot <[email protected]> | 2019-10-24 01:00:14 +0200 |
|---|---|---|
| committer | Edward Welbourne <[email protected]> | 2019-10-24 10:23:44 +0200 |
| commit | b327807c5ed6f151bfb22c2fe204ed289a3b6254 (patch) | |
| tree | 880a0e7664e1270f4f51ccf79a3cf2ddbcd7d810 /src/gui/opengl/qopenglversionfunctions.h | |
| parent | aa4b0f5cb7e84046530fbc26581f777506fea658 (diff) | |
| parent | b61c6164c100defc519b178d73858df59cffc48d (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/corelib/io/qstandardpaths_unix.cpp
src/corelib/tools/qsharedpointer_impl.h
tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
Change-Id: Iae95c5778dc091058f16f6db76f04a0178a9e809
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 aa6e49b9aed..4835ea4871c 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 |