diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-15 15:32:08 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-15 16:03:41 +0100 |
| commit | c69f510ed6e85c64f02ee0ee030336cd9aa66793 (patch) | |
| tree | c2555af8f13b5336047e17548092bf1590f81576 /src/core/ozone | |
| parent | af30e7857e205990057735a07fe0974af9db8733 (diff) | |
| parent | 74d2d301b11f2edfde69f0515e2fd74882ab6dab (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I0822fb8a10945a252cfd1aacaf0b6d9902cc8831
Diffstat (limited to 'src/core/ozone')
| -rw-r--r-- | src/core/ozone/gl_surface_glx_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ozone/gl_surface_glx_qt.cpp b/src/core/ozone/gl_surface_glx_qt.cpp index eebefa59b..4faa08091 100644 --- a/src/core/ozone/gl_surface_glx_qt.cpp +++ b/src/core/ozone/gl_surface_glx_qt.cpp @@ -173,7 +173,7 @@ bool GLSurfaceGLXQt::Initialize(GLSurfaceFormat format) GLX_PBUFFER_HEIGHT, m_size.height(), GLX_LARGEST_PBUFFER, x11::False, GLX_PRESERVED_CONTENTS, x11::False, - GLX_NONE + NULL }; m_surfaceBuffer = glXCreatePbuffer(display, static_cast<GLXFBConfig>(g_config), pbuffer_attributes); |