diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-14 03:00:54 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-14 03:00:54 +0200 |
| commit | 3d6a360730a8d6563e35dfee65ce4ef7b7416ab2 (patch) | |
| tree | bbb0b1f9238c0f7f20219b08b496cebd4a5fe2f6 | |
| parent | c6dd09e3e91c3f38cf47bafb263d3b270c47630b (diff) | |
| parent | 10f1effdc1c776c24b5314024aa3d04752dd2dfe (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I46001e91691d29540c1ce21be9d72fddf3684a13
| -rw-r--r-- | src/plugins/platforms/webgl/qwebglcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/webgl/qwebglcontext.cpp b/src/plugins/platforms/webgl/qwebglcontext.cpp index 397e26f..cb56182 100644 --- a/src/plugins/platforms/webgl/qwebglcontext.cpp +++ b/src/plugins/platforms/webgl/qwebglcontext.cpp @@ -57,9 +57,9 @@ static Q_LOGGING_CATEGORY(lc, "qt.qpa.webgl.context") class QWebGLContextPrivate { public: - int id = -1; static QAtomicInt nextId; static QSet<int> waitingIds; + union { int id = -1; qintptr padded; }; QPlatformSurface *currentSurface = nullptr; QSurfaceFormat surfaceFormat; }; |