diff options
Diffstat (limited to 'src/platformsupport/kmsconvenience/qkmsdevice_p.h')
-rw-r--r-- | src/platformsupport/kmsconvenience/qkmsdevice_p.h | 60 |
1 files changed, 12 insertions, 48 deletions
diff --git a/src/platformsupport/kmsconvenience/qkmsdevice_p.h b/src/platformsupport/kmsconvenience/qkmsdevice_p.h index 55a590cfce..050d836cb1 100644 --- a/src/platformsupport/kmsconvenience/qkmsdevice_p.h +++ b/src/platformsupport/kmsconvenience/qkmsdevice_p.h @@ -1,43 +1,7 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Copyright (C) 2016 Pelagicore AG -** Copyright (C) 2015 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// Copyright (C) 2016 Pelagicore AG +// Copyright (C) 2015 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QKMSDEVICE_P_H #define QKMSDEVICE_P_H @@ -66,7 +30,7 @@ #include <functional> // In less fortunate cases one may need to build on a system with dev headers -// from the dark ages. Let's pull a GL and define the missing stuff outselves. +// from the dark ages. Let's pull a GL and define the missing stuff ourselves. #ifndef DRM_PLANE_TYPE_OVERLAY #define DRM_PLANE_TYPE_OVERLAY 0 @@ -111,6 +75,7 @@ public: }; QKmsScreenConfig(); + virtual ~QKmsScreenConfig() {} QString devicePath() const { return m_devicePath; } @@ -122,10 +87,9 @@ public: VirtualDesktopLayout virtualDesktopLayout() const { return m_virtualDesktopLayout; } QMap<QString, QVariantMap> outputSettings() const { return m_outputSettings; } + virtual void loadConfig(); -private: - void loadConfig(); - +protected: QString m_devicePath; bool m_headless; QSize m_headlessSize; @@ -163,7 +127,7 @@ struct QKmsPlane int possibleCrtcs = 0; - QVector<uint32_t> supportedFormats; + QList<uint32_t> supportedFormats; Rotations initialRotation = Rotation0; Rotations availableRotations = Rotation0; @@ -207,7 +171,7 @@ struct QKmsOutput uint32_t drm_format = DRM_FORMAT_XRGB8888; bool drm_format_requested_by_user = false; QString clone_source; - QVector<QKmsPlane> available_planes; + QList<QKmsPlane> available_planes; struct QKmsPlane *eglfs_plane = nullptr; QSize size; uint32_t crtcIdPropertyId = 0; @@ -258,7 +222,7 @@ protected: virtual QPlatformScreen *createHeadlessScreen(); virtual void registerScreenCloning(QPlatformScreen *screen, QPlatformScreen *screenThisScreenClones, - const QVector<QPlatformScreen *> &screensCloningThisScreen); + const QList<QPlatformScreen *> &screensCloningThisScreen); virtual void registerScreen(QPlatformScreen *screen, bool isPrimary, const QPoint &virtualPos, @@ -292,7 +256,7 @@ protected: #endif quint32 m_crtc_allocator; - QVector<QKmsPlane> m_planes; + QList<QKmsPlane> m_planes; private: Q_DISABLE_COPY(QKmsDevice) |