diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-24 15:29:17 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-24 15:29:17 +0200 |
| commit | 06d32b235a21fb612972d248089805423a97bc18 (patch) | |
| tree | 2fa2c5045322ec7e1677d2f5a4d45e2df565b19a /doc/src/development/activeqt-idc.qdoc | |
| parent | 9face4b88de2db6f552149d2f96257620e971a59 (diff) | |
| parent | 534f5098c577f262b4b01d1c21cd0ec1af0f25f1 (diff) | |
| download | qt4-tools-06d32b235a21fb612972d248089805423a97bc18.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'doc/src/development/activeqt-idc.qdoc')
| -rw-r--r-- | doc/src/development/activeqt-idc.qdoc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/src/development/activeqt-idc.qdoc b/doc/src/development/activeqt-idc.qdoc index a076212793..bf024af57f 100644 --- a/doc/src/development/activeqt-idc.qdoc +++ b/doc/src/development/activeqt-idc.qdoc @@ -7,20 +7,20 @@ ** This file is part of the documentation of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:FDL$ -** 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. -** ** 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. +** Foundation and appearing in the file included in the packaging of +** this file. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. ** $QT_END_LICENSE$ ** ****************************************************************************/ |