diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-14 15:49:08 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-02-14 15:49:08 +0000 |
| commit | 7bc1d6effaae8f5aa1bef92cb1094ec3b3f4fb95 (patch) | |
| tree | cde8deeea717fc25d64640d96cf13a4fd44d9db1 /src/dbus/doc/src/qtdbus-index.qdoc | |
| parent | 2aeb2bcef48d7bca2186c262dde433737956a539 (diff) | |
| parent | 305dd1b61f657474d751cc3b24f58249ec21b61b (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.11" into refs/staging/5.11
Diffstat (limited to 'src/dbus/doc/src/qtdbus-index.qdoc')
| -rw-r--r-- | src/dbus/doc/src/qtdbus-index.qdoc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/dbus/doc/src/qtdbus-index.qdoc b/src/dbus/doc/src/qtdbus-index.qdoc index 080066cfa8..eed5e42731 100644 --- a/src/dbus/doc/src/qtdbus-index.qdoc +++ b/src/dbus/doc/src/qtdbus-index.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -200,6 +200,15 @@ Information about the messages will be written to the console the application was launched from. + \section1 Licenses + + The Qt D-Bus 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. + \section1 Further Reading The following documents contain information about Qt's D-Bus integration |