diff options
Diffstat (limited to 'src/compositor/extensions/qwaylandxdgdecorationv1.cpp')
-rw-r--r-- | src/compositor/extensions/qwaylandxdgdecorationv1.cpp | 41 |
1 files changed, 9 insertions, 32 deletions
diff --git a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp index 7b80cf014..c7af0bca5 100644 --- a/src/compositor/extensions/qwaylandxdgdecorationv1.cpp +++ b/src/compositor/extensions/qwaylandxdgdecorationv1.cpp @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2018 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWaylandCompositor module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2018 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "qwaylandxdgdecorationv1_p.h" @@ -39,6 +13,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype XdgDecorationManagerV1 + \instantiates QWaylandXdgDecorationManagerV1 \inqmlmodule QtWayland.Compositor.XdgShell \since 5.12 \brief Provides an extension for negotiation of server-side and client-side window decorations. @@ -52,8 +27,8 @@ QT_BEGIN_NAMESPACE To provide the functionality of the extension in a compositor, create an instance of the XdgDecorationManagerV1 component and add it to the list of extensions supported by the compositor: - \qml \QtMinorVersion - import QtWayland.Compositor 1.\1 + \qml + import QtWayland.Compositor WaylandCompositor { // Xdg decoration manager assumes xdg-shell is being used @@ -68,7 +43,7 @@ QT_BEGIN_NAMESPACE } \endqml - \sa QWaylandXdgToplevel::decorationMode + \sa QWaylandXdgToplevel::decorationMode, {Server Side Decoration Compositor} */ /*! @@ -111,7 +86,7 @@ void QWaylandXdgDecorationManagerV1::initialize() } /*! - \qmlproperty string QtWaylandCompositor::XdgDecorationManagerV1::preferredMode + \qmlproperty string XdgDecorationManagerV1::preferredMode This property holds the decoration mode the compositor prefers. @@ -251,3 +226,5 @@ void QWaylandXdgToplevelDecorationV1::handleClientPreferredModeChanged() } QT_END_NAMESPACE + +#include "moc_qwaylandxdgdecorationv1.cpp" |