diff options
Diffstat (limited to 'doc/src/legal/opensourcelicense.qdoc')
| -rw-r--r-- | doc/src/legal/opensourcelicense.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/legal/opensourcelicense.qdoc b/doc/src/legal/opensourcelicense.qdoc index 641269a70..8b81c77e8 100644 --- a/doc/src/legal/opensourcelicense.qdoc +++ b/doc/src/legal/opensourcelicense.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -40,8 +40,8 @@ of free in this context as in "free speech", not as in "no cost". Digia supports the free software concept by providing the Qt Open Source - Edition, which is licensed under the \l{GNU General Public License (GPL)} - (version 3) and the \l{GNU Lesser General Public License (LGPL)} (version 2.1). + Edition, which is licensed under the \l{GNU Lesser General Public License (LGPL)} + version 3 and the GNU LGPL version 2.1. You can use this edition of Qt to create and distribute software with licenses that are compatible with these free software licenses. @@ -52,12 +52,12 @@ successful software projects like KDE to thrive, with thousands of developers around the world using open source versions of Qt at no cost to themselves. - The Open Source Edition can be downloaded from the \l{Opensource Downloads} page. + The Open Source Edition can be downloaded from the \l{Downloads} page. More information on Free and Open Source software is available online. \list - \li GNU GPL, GNU LGPL: \l http://www.gnu.org/ + \li GNU LGPL: \l http://www.gnu.org/ \li Open Source licensing: \l http://www.opensource.org/ \endlist @@ -68,6 +68,6 @@ in the \l{Qt Licensing Overview} on the Qt website. If you are in doubt what edition of Qt is right for your project, - please contact Digia at \l http://qt.digia.com/contact-us. + please contact us: \l {http://www.qt.io/contact-us/}. */ |