diff options
Diffstat (limited to 'src/compositor/doc/src/qt6-changes.qdoc')
| -rw-r--r-- | src/compositor/doc/src/qt6-changes.qdoc | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/src/compositor/doc/src/qt6-changes.qdoc b/src/compositor/doc/src/qt6-changes.qdoc index e77b201f0..7a9a12016 100644 --- a/src/compositor/doc/src/qt6-changes.qdoc +++ b/src/compositor/doc/src/qt6-changes.qdoc @@ -1,29 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \page qtwayland-changes-qt6.html @@ -39,5 +15,16 @@ In this topic we summarize those changes in Qt Wayland Compositor, and provide guidance to handle them. - \section1 ADD STUFF HERE + \section1 Import of Shell Classes + + In Qt 5, a few auxiliary classes were available through the Qt Wayland + Compositor namespace. In order to improve the logical separation of + these from the primary functionality of the compositor, they have been + moved into separate imports in Qt 6. + + \list + \li \l WlShell types are now available in \c QtWayland.Compositor.WlShell + \li \l XdgShell types are now available in \c QtWayland.Compositor.XdgShell + \li \l IviApplication types are now available in \c QtWayland.Compositor.IviApplication + \endlist */ |