From cc652bdd4ec7692a68db8afef2a709b74581c2cd Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Tue, 27 Oct 2020 14:56:32 +0100 Subject: [PATCH 03/52] Doc: List correct license information for the module Fixes: QTBUG-87959 Change-Id: I1c5cd15e0dd6f81e87690e54cd4e526ce668a8aa Reviewed-by: Tino Pyssysalo Reviewed-by: Kai Koehne (cherry picked from commit 7cadb86e5b151459bd06f46a90f28bd157078df7) Reviewed-by: Qt Cherry-pick Bot --- .../doc/src/qtwaylandcompositor-overview.qdoc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc b/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc index dc95dc5b..fcdd13f7 100644 --- a/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc +++ b/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc @@ -111,9 +111,13 @@ Qt Wayland Compositor and the Qt Wayland integration plugin are available under commercial licenses from \l{The Qt Company}. - In addition, they are available under the - \l{GNU Lesser General Public License, version 3}, or - the \l{GNU General Public License, version 2}. + + In addition, Qt Wayland Compositor is available under the + \l{GNU General Public License, version 3}, while + the Qt Wayland integration plugin is available under the + \l{GNU General Public License, version 3} or the + \l{GNU General Public License, version 2}. + See \l{Qt Licensing} for further details. Qt Wayland Compositor and the Qt Wayland integration plugin -- 2.35.1