summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2020-09-24 13:13:43 +0200
committerPaul Wicking <paul.wicking@qt.io>2020-09-24 21:27:18 +0200
commit7ae0ccc3fcd565da0d36ad07ffd67bce5d75df07 (patch)
treefcd8032a0083baf78d6959fe26d4761fbb27eba0
parentca63fe81df8ac910f43539719566ed6745700c2b (diff)
Doc: Add Qt 6 changes file
Task-number: QTBUG-84051 Change-Id: Ia7b75e75498722c251e1a712143daa71044e7f71 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r--src/compositor/doc/src/qt6-changes.qdoc43
-rw-r--r--src/compositor/doc/src/qtwaylandcompositor-overview.qdoc4
2 files changed, 47 insertions, 0 deletions
diff --git a/src/compositor/doc/src/qt6-changes.qdoc b/src/compositor/doc/src/qt6-changes.qdoc
new file mode 100644
index 000000000..e77b201f0
--- /dev/null
+++ b/src/compositor/doc/src/qt6-changes.qdoc
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+/*!
+ \page qtwayland-changes-qt6.html
+ \title Porting to Qt 6 - Qt Wayland Compositor
+
+ Qt 6 is a result of the conscious effort to make the framework more
+ efficient and easy to use.
+
+ We try to maintain binary and source compatibility for all the public
+ APIs in each release. But some changes were inevitable in an effort to
+ make Qt a better framework.
+
+ In this topic we summarize those changes in Qt Wayland Compositor, and
+ provide guidance to handle them.
+
+ \section1 ADD STUFF HERE
+*/
diff --git a/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc b/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc
index dc95dc5be..1a5b27653 100644
--- a/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc
+++ b/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc
@@ -107,6 +107,10 @@
\li \l{Qt Wayland Compositor C++ Classes}
\endlist
+ \section1 Module Evolution
+ \l{Porting to Qt 6 - Qt Wayland Compositor} lists important changes in the
+ module API and functionality that were done for the Qt 6 series of Qt.
+
\section1 Licenses and Attributions
Qt Wayland Compositor and the Qt Wayland integration plugin