diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 09:19:40 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 09:19:40 +0300 |
commit | 2b6766f09ad53f1cf2ba7cfe95976b4322c2e8fd (patch) | |
tree | 35c238f57be475e69abd3e34baa32a136739dfd5 /src/doc/src/qtee-licenses.qdoc | |
parent | f6de3a059ea2207104ff8f23718d714ac4ff41d2 (diff) | |
parent | 57b15814c8865e517c43fe173c0ffcadf8557ade (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
* origin/5.7:
Doc: Document QtDeviceUtilities
Doc: Remove rest of the generic Qt for Device Creation doc files
Doc: Bump version to 5.7.1
Doc: Remove generic Device Creation documentation
Added additional instructions for Windows users using BeagleBone Black
Fixes to networkSettingsService model handling
Updated icons
Doc: Add documentation for NVIDIA DRIVE CX
Doc: Add documentation for Intel NUC
Doc: Remove references to SILICA ArchiTech Tibidabo
Doc: Bump version to 5.7.0
Fixed connman backend crashes and changed it as default.
Conflicts:
src/doc/src/qtee-changelog.qdoc
src/doc/src/qtee-index.qdoc
src/doc/src/qtee-static-linking.qdoc
Change-Id: Idb13f9fd130211213434576ab5cc3d38766e9711
Diffstat (limited to 'src/doc/src/qtee-licenses.qdoc')
-rw-r--r-- | src/doc/src/qtee-licenses.qdoc | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/src/doc/src/qtee-licenses.qdoc b/src/doc/src/qtee-licenses.qdoc deleted file mode 100644 index 9119765..0000000 --- a/src/doc/src/qtee-licenses.qdoc +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use the contact form at -** http://www.qt.io -** -** This file is part of Qt Enterprise Embedded. -** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** the contact form at http://www.qt.io -** -****************************************************************************/ - -/*! - \page qtee-licenses.html - \title License Information - \previouspage qtee-troubleshooting.html - \nextpage qtee-module-reference.html - - \section1 Licensing - - \SDK is licensed under the Qt Enterprise commercial license. For more information, - see \l {http://www.qt.io/licensing}. Evaluation licenses are also available, - see \l {product page}{Qt for Device Creation} on www.qt.io. - - \section1 3rd Party Software Licenses - - The following third-party components are used in \SDK: - - \table - \row \li Component \li Description \li License Type - \row \li EGL 1.5 Headers - \li These headers are based on EGL 1.5 specification. - \li MIT License - - \row \li OpenGL ES 2.0 Headers - \li These headers are based on Open GL ES 2.0 specification. - \li MIT and SGI License - - \row \li OpenGL ES 3.1 Headers - \li These headers are based on OpenGL ES 3.1 specification. - \li MIT and SGI License - - \row \li OpenKODE Core 1.0 Header - \li The header is based on OpenKODE Core 1.0 specification. - \li MIT License - - \row \li Lipi Toolkit (LipiTk) - \li An open source toolkit for online Handwriting Recognition (HWR). - \li MIT-Style License - - \row \li OpenWnn - \li A Japanese IME - \li Apache License - - \row \li Pinyin - \li An IME for Standard Chinese input. - \li Apache License - - \row \li Traditional Chinese IME (tcime) - \li A traditional Chinese IME. - \li Apache License - \endtable - - See the \l{Licenses Used by Qt}{licenses} page for the complete list - of third-Party components used by Qt. - - \section1 Embedded Linux Images - - The embedded Linux platform is built using tools from the \l {Yocto Project}. - The open source licenses and notices are located in - \list - \li \c /usr/share/common-licenses/license.manifest - \li \c /usr/share/licenses/* - \endlist -*/ |