diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-24 10:40:09 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-24 10:40:09 +0100 |
| commit | 9c5f59d82120a0f25ab6ab9763a4166175c4508d (patch) | |
| tree | 9601733e73536315e4848bdfc639ddb67b410611 /src/core/gl_surface_qt.cpp | |
| parent | d502c6e9d09803dd268100f8c53cf7bc563e3d1d (diff) | |
| parent | f2d938962fe9a029ec0baf37ca7f478051125780 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/core/download_manager_delegate_qt.cpp
Change-Id: Ica57e582a323c6bd014a64bb615dd9454e656548
Diffstat (limited to 'src/core/gl_surface_qt.cpp')
| -rw-r--r-- | src/core/gl_surface_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index f731b0231..344a4459f 100644 --- a/src/core/gl_surface_qt.cpp +++ b/src/core/gl_surface_qt.cpp @@ -267,7 +267,7 @@ bool GLSurfaceQtGLX::Initialize(GLSurfaceFormat format) GLX_PBUFFER_HEIGHT, m_size.height(), GLX_LARGEST_PBUFFER, False, GLX_PRESERVED_CONTENTS, False, - GLX_NONE + 0 }; m_surfaceBuffer = glXCreatePbuffer(display, static_cast<GLXFBConfig>(g_config), pbuffer_attributes); |