From 4db2e07f97e70a580f2e29ff1c4519d731840fb6 Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@qt.io>
Date: Wed, 21 Nov 2018 13:05:55 +0100
Subject: [PATCH] Doc: Document Qt Quick WebGL plugin license
Mention that Qt Quick WebGL plugin is available under a commercial
and GPLv3 licenses, and move it under the correct section in
'All Qt Modules' page.
Task-number: QTBUG-67910
Change-Id: Ia5c063d27c100b1156751313c884f32eb6ab3cf1
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
---
doc/src/platforms/webgl.qdoc | 6 ++++++
doc/src/qtmodules.qdoc | 16 ++++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/doc/src/platforms/webgl.qdoc b/doc/src/platforms/webgl.qdoc
index 07f0d791..04319dc1 100644
--- a/doc/src/platforms/webgl.qdoc
+++ b/doc/src/platforms/webgl.qdoc
@@ -93,4 +93,10 @@ the application.
\badcode
set QSG_RENDER_LOOP=threaded
\endcode
+
+\section1 Licenses
+
+Qt Quick WebGL is available under commercial licenses from \l{The Qt Company}.
+In addition, it is available under the \l{GNU General Public License, version 3}.
+See \l{Qt Licensing} for further details.
*/
diff --git a/doc/src/qtmodules.qdoc b/doc/src/qtmodules.qdoc
index 42f2989f..9c97a970 100644
--- a/doc/src/qtmodules.qdoc
+++ b/doc/src/qtmodules.qdoc
@@ -260,13 +260,6 @@
\li
\li Provides a specialized set of controls that can be used to build
interfaces in Qt Quick.
- \row
- \li \l {Qt Quick WebGL}
- \li All
- \li WebGL-enabled web browsers
- \li Provides a \l {Qt Platform Abstraction} {platform plugin} that
- allows streaming Qt Quick user interfaces over the network using
- WebGLâ„¢.
\row
\li \l{Qt Quick Widgets C++ Classes}{Qt Quick Widgets}
\li All
@@ -393,7 +386,14 @@
\li A framework for implementing different input methods as
well as a QML virtual keyboard. Supports localized keyboard
layouts and custom visual themes.
- \endtable
+ \row
+ \li \l {Qt Quick WebGL}
+ \li All
+ \li WebGL-enabled web browsers
+ \li Provides a \l {Qt Platform Abstraction} {platform plugin} that
+ allows streaming Qt Quick user interfaces over the network using
+ WebGLâ„¢.
+ \endtable
\section1 Value-Add Modules
--
GitLab