diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-22 22:36:13 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-22 22:36:13 (GMT) |
| commit | 27d59016d35ae84d89e8d09bdadb1c3a89ac3f22 (patch) | |
| tree | f493da0591281db183c23c86ecc3dc078009cafa /doc/src/deployment/qt-conf.qdoc | |
| parent | b92a7337d47e8b1be2d65d5a726f7a6f291a65bb (diff) | |
| parent | 5d3b132dd94f6c985fa3f9584dedb46823acddfe (diff) | |
| download | Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.zip Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.gz Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.bz2 | |
Merge remote branch 'origin/4.7' into qml-4.7
Conflicts:
examples/declarative/modelviews/webview/transparent.qml
Diffstat (limited to 'doc/src/deployment/qt-conf.qdoc')
| -rw-r--r-- | doc/src/deployment/qt-conf.qdoc | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc index 298f539..48d688b 100644 --- a/doc/src/deployment/qt-conf.qdoc +++ b/doc/src/deployment/qt-conf.qdoc @@ -6,35 +6,21 @@ ** ** This file is part of the documentation of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. +** $QT_BEGIN_LICENSE:FDL$ +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in a +** written agreement between you and Nokia. ** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU Free Documentation License +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of this +** file. ** ** If you have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ |