diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-03-26 14:05:09 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-03-26 20:27:34 +0100 |
| commit | 2f471f1fc80952a715299b7faf2db738944f9bd0 (patch) | |
| tree | 49212acc17a3df29b46bdfa7d22cfc26b021f915 | |
| parent | 1d5c00fde1d2263dd74f2bdc8590783057ec853e (diff) | |
Replace NULL in gl_surface_qt.cpp
Fixes build error with MSVC:
error C2440: 'return': cannot convert from 'int' to 'scoped_refptr<gl::GLSurface>'
Change-Id: Ie24528cc98951de6863c12e1d25e3722bd20b046
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/core/ozone/gl_surface_qt.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/ozone/gl_surface_qt.cpp b/src/core/ozone/gl_surface_qt.cpp index c54a8f12e..4be17f12b 100644 --- a/src/core/ozone/gl_surface_qt.cpp +++ b/src/core/ozone/gl_surface_qt.cpp @@ -76,9 +76,9 @@ namespace { bool g_initializedEGL = false; } -void* GLSurfaceQt::g_display = NULL; -void* GLSurfaceQt::g_config = NULL; -const char* GLSurfaceQt::g_extensions = NULL; +void* GLSurfaceQt::g_display = nullptr; +void* GLSurfaceQt::g_config = nullptr; +const char* GLSurfaceQt::g_extensions = nullptr; GLSurfaceQt::~GLSurfaceQt() { @@ -196,14 +196,14 @@ CreateOffscreenGLSurfaceWithFormat(const gfx::Size& size, GLSurfaceFormat format } LOG(ERROR) << "Requested OpenGL implementation is not supported. Implementation: " << GetGLImplementation(); Q_UNREACHABLE(); - return NULL; + return nullptr; } scoped_refptr<GLSurface> CreateViewGLSurface(gfx::AcceleratedWidget window) { QT_NOT_USED - return NULL; + return nullptr; } } // namespace init |