qiurui
/
qtdoc
mirror of https://github.com/qt/qtdoc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Topi Reinio 2018-11-21 13:05:55 +01:00 committed by Topi Reiniö
parent 144395f0aa
commit 4db2e07f97
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/platforms/webgl.qdoc
View File

@ -93,4 +93,10 @@ the application.
\badcode \badcode
set QSG_RENDER_LOOP=threaded set QSG_RENDER_LOOP=threaded
\endcode \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.
*/ */

16
doc/src/qtmodules.qdoc
View File

@ -260,13 +260,6 @@
\li \li
\li Provides a specialized set of controls that can be used to build \li Provides a specialized set of controls that can be used to build
interfaces in Qt Quick. 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 \row
\li \l{Qt Quick Widgets C++ Classes}{Qt Quick Widgets} \li \l{Qt Quick Widgets C++ Classes}{Qt Quick Widgets}
\li All \li All
@ -393,7 +386,14 @@
\li A framework for implementing different input methods as \li A framework for implementing different input methods as
well as a QML virtual keyboard. Supports localized keyboard well as a QML virtual keyboard. Supports localized keyboard
layouts and custom visual themes. 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 \section1 Value-Add Modules