path: root/src/opengl/doc/src
diff options
authorKai Koehne <>2018-01-22 16:04:46 +0100
committerKai Koehne <>2018-01-24 13:19:24 +0000
commitc4b596fb7902abfb9d53e7819612b9a83ac5a8d6 (patch)
tree2e9aa6af71b41f5c36d42971f3a1af908c2ab4ec /src/opengl/doc/src
parentaaacae8fe7bb1ca4983cf95fcb8d38320bb21450 (diff)
Document licenses for all Qt modules
Follow the example of the other modules and explicitly mention the valid licenses on each module landing page, optionally combining it with trademark information. Change-Id: I9f1fea0f002e0ab607da89a0cbfe7c53060582d7 Reviewed-by: Leena Miettinen <> Reviewed-by: Topi Reiniƶ <>
Diffstat (limited to 'src/opengl/doc/src')
1 files changed, 13 insertions, 4 deletions
diff --git a/src/opengl/doc/src/qtopengl-index.qdoc b/src/opengl/doc/src/qtopengl-index.qdoc
index 6ab888a14d..30b657f6db 100644
--- a/src/opengl/doc/src/qtopengl-index.qdoc
+++ b/src/opengl/doc/src/qtopengl-index.qdoc
@@ -1,6 +1,6 @@
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
** Contact:
** This file is part of the documentation of the Qt Toolkit.
@@ -41,9 +41,6 @@
platform, Microsoft Foundation Classes (MFC) under Windows, or Qt
on both platforms.
- \note OpenGL is a trademark of Silicon Graphics, Inc. in
- the United States and other countries.
The Qt OpenGL module makes it easy to use OpenGL in Qt applications.
It provides an OpenGL widget class that can be used just like any
other Qt widget, except that it opens an OpenGL display buffer where
@@ -68,4 +65,16 @@
The \l{Qt OpenGL C++ Classes} page gives an overview over the available classes
in this module.
+ \section1 Licenses and Trademarks
+ The Qt OpenGL module is available under commercial licenses from \l{The Qt Company}.
+ In addition, it is available under free software licenses. Since Qt 5.4,
+ these free software licenses are
+ \l{GNU Lesser General Public License, version 3}, or
+ the \l{GNU General Public License, version 2}.
+ See \l{Qt Licensing} for further details.
+ OpenGL\reg is a trademark of Silicon Graphics, Inc. in
+ the United States and other countries.