diff options
Diffstat (limited to 'src/plugins/platforms/minimalegl')
4 files changed, 10 insertions, 17 deletions
diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt index 286e8aa5af..a6ec8be781 100644 --- a/src/plugins/platforms/minimalegl/CMakeLists.txt +++ b/src/plugins/platforms/minimalegl/CMakeLists.txt @@ -1,8 +1,7 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause -# Generated from minimalegl.pro. -qt_find_package(EGL) # special case +qt_find_package(EGL) ##################################################################### ## QMinimalEglIntegrationPlugin Plugin: @@ -11,7 +10,7 @@ qt_find_package(EGL) # special case qt_internal_add_plugin(QMinimalEglIntegrationPlugin OUTPUT_NAME qminimalegl PLUGIN_TYPE platforms - DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl # special case + DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES minimalegl SOURCES main.cpp qminimaleglintegration.cpp qminimaleglintegration.h @@ -24,12 +23,9 @@ qt_internal_add_plugin(QMinimalEglIntegrationPlugin Qt::CorePrivate Qt::Gui Qt::GuiPrivate - EGL::EGL # special case + EGL::EGL ) -#### Keys ignored in scope 1:.:.:minimalegl.pro:<TRUE>: -# OTHER_FILES = "minimalegl.json" - ## Scopes: ##################################################################### @@ -39,6 +35,3 @@ qt_internal_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_open LIBRARIES Qt::OpenGL ) - -#### Keys ignored in scope 3:.:.:minimalegl.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/minimalegl/main.cpp b/src/plugins/platforms/minimalegl/main.cpp index 8f7d91dce9..3586535277 100644 --- a/src/plugins/platforms/minimalegl/main.cpp +++ b/src/plugins/platforms/minimalegl/main.cpp @@ -22,7 +22,7 @@ QPlatformIntegration* QMinimalEglIntegrationPlugin::create(const QString& system if (!system.compare("minimalegl"_L1, Qt::CaseInsensitive)) return new QMinimalEglIntegration; - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp b/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp index 5b18ffda2c..88131f4f99 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglbackingstore.cpp @@ -11,7 +11,7 @@ QT_BEGIN_NAMESPACE QMinimalEglBackingStore::QMinimalEglBackingStore(QWindow *window) : QPlatformBackingStore(window) , m_context(new QOpenGLContext) - , m_device(0) + , m_device(nullptr) { m_context->setFormat(window->requestedFormat()); m_context->setScreen(window->screen()); diff --git a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp index 64123f0e8f..716caea067 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp @@ -41,8 +41,8 @@ public: QMinimalEglScreen::QMinimalEglScreen(EGLNativeDisplayType display) : m_depth(32) , m_format(QImage::Format_Invalid) - , m_platformContext(0) - , m_surface(0) + , m_platformContext(nullptr) + , m_surface(nullptr) { #ifdef QEGL_EXTRA_DEBUG qWarning("QEglScreen %p\n", this); @@ -123,7 +123,7 @@ void QMinimalEglScreen::createAndSetPlatformContext() q_printEglConfig(m_dpy, config); #endif - m_surface = eglCreateWindowSurface(m_dpy, config, eglWindow, NULL); + m_surface = eglCreateWindowSurface(m_dpy, config, eglWindow, nullptr); if (Q_UNLIKELY(m_surface == EGL_NO_SURFACE)) { qWarning("Could not create the egl surface: error = 0x%x\n", eglGetError()); eglTerminate(m_dpy); @@ -132,7 +132,7 @@ void QMinimalEglScreen::createAndSetPlatformContext() // qWarning("Created surface %dx%d\n", w, h); #ifndef QT_NO_OPENGL - QEGLPlatformContext *platformContext = new QMinimalEglContext(platformFormat, 0, m_dpy); + QEGLPlatformContext *platformContext = new QMinimalEglContext(platformFormat, nullptr, m_dpy); m_platformContext = platformContext; #endif EGLint w,h; // screen size detection |