summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Burtsev <kirill.burtsev@qt.io>2019-03-12 13:05:20 +0100
committerKirill Burtsev <kirill.burtsev@qt.io>2019-03-15 07:49:40 +0000
commitac147ec310c71510f8d72d52c3fcec2bfe49b4a4 (patch)
treecc996373378ce318271a920e1f9d56eb24c90153
parent2bf39d83a532a7fa69adc99caafaa523276b03c5 (diff)
Fix warning: implicit conversion of NULL constant to 'const int'
Task-number: QTBUG-74311 Change-Id: If912564ecd29e4f11a613905f2b9169326207ec2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/ozone/gl_surface_glx_qt.cpp2
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 4faa08091..24772889f 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,
- NULL
+ x11::None // MEMO doc: ...must be terminated with None or NULL
};
m_surfaceBuffer = glXCreatePbuffer(display, static_cast<GLXFBConfig>(g_config), pbuffer_attributes);