summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2011-04-08 06:05:55 (GMT)
committerMartin Smith <martin.smith@nokia.com>2011-04-08 06:05:55 (GMT)
commit932b28483f82f3fbc3a007ecdc5fbb152b504024 (patch)
tree56373f4412fb90ca97aced441b9199d07666606c /tools
parent779a58513f0c2d4e55410aee4cae6a6510841d57 (diff)
downloadQt-932b28483f82f3fbc3a007ecdc5fbb152b504024.zip
Qt-932b28483f82f3fbc3a007ecdc5fbb152b504024.tar.gz
Qt-932b28483f82f3fbc3a007ecdc5fbb152b504024.tar.bz2
qdoc: Fixed license comment.
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/doc/corefeatures.qdoc28
1 files changed, 7 insertions, 21 deletions
diff --git a/tools/qdoc3/doc/corefeatures.qdoc b/tools/qdoc3/doc/corefeatures.qdoc
index ff903f8..ee579cf 100644
--- a/tools/qdoc3/doc/corefeatures.qdoc
+++ b/tools/qdoc3/doc/corefeatures.qdoc
@@ -4,37 +4,23 @@
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the documentation of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL$
+** $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 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$
**
****************************************************************************/