diff options
Diffstat (limited to 'src/compositor/extensions/qwaylandxdgoutputv1.h')
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgoutputv1.h | 49 |
1 files changed, 11 insertions, 38 deletions
diff --git a/src/compositor/extensions/qwaylandxdgoutputv1.h b/src/compositor/extensions/qwaylandxdgoutputv1.h index 957ac3bed..79a6235c7 100644 --- a/src/compositor/extensions/qwaylandxdgoutputv1.h +++ b/src/compositor/extensions/qwaylandxdgoutputv1.h @@ -1,45 +1,14 @@ -/**************************************************************************** -** -** Copyright (C) 2019 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtWaylandCompositor module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2019 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QWAYLANDXDGOUTPUTV1_H #define QWAYLANDXDGOUTPUTV1_H -#include <QRect> +#include <QtCore/QRect> #include <QtWaylandCompositor/QWaylandCompositorExtension> +#if QT_CONFIG(wayland_compositor_quick) #include <QtWaylandCompositor/qwaylandquickchildren.h> +#endif QT_BEGIN_NAMESPACE @@ -48,7 +17,7 @@ class QWaylandOutput; class QWaylandXdgOutputManagerV1Private; class QWaylandXdgOutputV1Private; -class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgOutputManagerV1 +class Q_WAYLANDCOMPOSITOR_EXPORT QWaylandXdgOutputManagerV1 : public QWaylandCompositorExtensionTemplate<QWaylandXdgOutputManagerV1> { Q_OBJECT @@ -62,11 +31,14 @@ public: static const wl_interface *interface(); }; -class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgOutputV1 : public QObject +class Q_WAYLANDCOMPOSITOR_EXPORT QWaylandXdgOutputV1 : public QObject { Q_OBJECT Q_DECLARE_PRIVATE(QWaylandXdgOutputV1) +#if QT_CONFIG(wayland_compositor_quick) Q_WAYLAND_COMPOSITOR_DECLARE_QUICK_CHILDREN(QWaylandXdgOutputV1) +#endif + Q_PROPERTY(QWaylandXdgOutputManagerV1 *manager READ manager NOTIFY managerChanged) Q_PROPERTY(QWaylandOutput *output READ output NOTIFY outputChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) @@ -74,6 +46,7 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandXdgOutputV1 : public QObject Q_PROPERTY(QPoint logicalPosition READ logicalPosition WRITE setLogicalPosition NOTIFY logicalPositionChanged) Q_PROPERTY(QSize logicalSize READ logicalSize WRITE setLogicalSize NOTIFY logicalSizeChanged) Q_PROPERTY(QRect logicalGeometry READ logicalGeometry NOTIFY logicalGeometryChanged) + Q_MOC_INCLUDE("qwaylandoutput.h") public: QWaylandXdgOutputV1(); QWaylandXdgOutputV1(QWaylandOutput *output, QWaylandXdgOutputManagerV1 *manager); |