summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-01-21 09:58:39 +0100
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-01-25 10:46:08 +0000
commit12dd16ce1990e8a6046172c13ad089b35f7d048f (patch)
treee2e37c66ac83f990d3cad14b760bfe6aff3af10b
parente5b6397c4af2189be82b0602059be88381cafffd (diff)
downloadqtdoc-12dd16ce1990e8a6046172c13ad089b35f7d048f.tar.gz
Doc: Update Qt licensing overview
Remove mentions of obsolete commercial licensing schemes, remove a link to download page (which no longer contains license-specific information), link to qt.io for sales contact details, and edit the formatting. Change-Id: I1bab8e2151c67ddca4c18690a3df104924362097 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
-rw-r--r--doc/src/legal/licenses.qdoc55
1 files changed, 23 insertions, 32 deletions
diff --git a/doc/src/legal/licenses.qdoc b/doc/src/legal/licenses.qdoc
index 788da704..589b98c7 100644
--- a/doc/src/legal/licenses.qdoc
+++ b/doc/src/legal/licenses.qdoc
@@ -31,51 +31,42 @@
\brief Information about licenses and licensing issues.
Qt is available under different licensing options designed to accommodate
- the needs of our various users.
+ the needs of our various users:
\list
- \li Enterprise, Professional, and Indie Mobile licenses.
- \li Community license (GPL or LGPL versions 3 and 2.1).
+ \li Qt licensed under \e commercial licenses are appropriate for
+ development of proprietary/commercial software where you do not want
+ to share any source code with third parties or otherwise cannot
+ comply with the terms of the GNU LGPL version 3 or the GNU LGPL
+ version 2.1.
+
+ \li Qt licensed under the \l{GNU Lesser General Public License (LGPL)}
+ version 3 is appropriate for the development of Qt applications
+ provided you can comply with the terms and conditions of the GNU LGPL
+ version 3 (or GNU GPL version 3).
+
+ \li Qt licensed under the \l{GNU Lesser General Public License (LGPL)}
+ version 2.1 is appropriate for the development of Qt applications
+ provided you can comply with the terms and conditions of the GNU LGPL
+ version 2.1.
\endlist
\note Some specific parts (modules) of the Qt framework are not available
under the GNU LGPL version 2.1. See \l {Licenses Used in Qt} for details.
- Qt licensed under Enterprise, Professional and Indie Mobile licenses are
- appropriate for development
- of proprietary/commercial software where you do not want to share any source code
- with third parties or otherwise cannot comply with the terms of the GNU LGPL
- version 3 or the GNU LGPL version 2.1.
+ \e {Qt documentation} is licensed under the terms of the \l{GNU Free
+ Documentation License (FDL)} version 1.3, as published by the Free Software
+ Foundation. Alternatively, you may use the documentation in accordance with
+ the terms contained in a written agreement between you and The Qt Company.
- Qt licensed under the \l{GNU Lesser General Public License (LGPL)} version 3
- is appropriate for the development of Qt applications provided you can comply
- with the terms and conditions of the GNU LGPL version 3 (or GNU GPL version 3).
-
- Qt licensed under the \l{GNU Lesser General Public License (LGPL)} version 2.1
- is appropriate for the development of Qt applications provided you can comply
- with the terms and conditions of the GNU LGPL version 2.1.
-
- Qt documentation is licensed under the terms of the \l{GNU Free Documentation
- License (FDL)} version 1.3, as published by the Free Software Foundation.
- Alternatively, you may use the documentation in accordance with the terms
- contained in a written agreement between you and The Qt Company.
-
- See \l{http://qt.io/licensing/} for an overview of Qt licensing, and
- \l{http://www.qt.io/download/} for details on what is included in each license
- type.
+ See \l{http://qt.io/licensing/} for an overview of Qt licensing.
\section1 Purchasing and Sales Information
To purchase a Qt license, visit \l{http://www.qt.io/download/}.
- For further information and assistance about Qt licensing,
- please contact our sales via one of the following channels:
-
- \table
- \row \li Web: \li \l{http://www.qt.io/contact-us/}
- \row \li Phone, U.S. office (for sales in North America): \li \b{+1 408 433 9320}
- \row \li Phone, Norway office (for sales in the rest of the world): \li \b{+47 2108 0420}
- \endtable
+ For further information and assistance about Qt licensing, contact our
+ sales; see \l{http://www.qt.io/locations/} for contact details.
\section1 Licenses Used in Qt