summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qcache.qdoc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-06-21 13:46:02 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-06-21 13:46:02 (GMT)
commitd11e3d6e327677e828918de3173732116976fbe4 (patch)
tree630c1fd52770212bc52bf3145d3cafe3dea77a35 /src/corelib/tools/qcache.qdoc
parentfc0e74d5661da0a678a60082dae60d4564da94b0 (diff)
downloadQt-d11e3d6e327677e828918de3173732116976fbe4.zip
Qt-d11e3d6e327677e828918de3173732116976fbe4.tar.gz
Qt-d11e3d6e327677e828918de3173732116976fbe4.tar.bz2
Doc: Relicensed the documentation under the GNU FDL version 1.3.
Reviewed-by: Trust Me Requested-by: Legal
Diffstat (limited to 'src/corelib/tools/qcache.qdoc')
-rw-r--r--src/corelib/tools/qcache.qdoc36
1 files changed, 11 insertions, 25 deletions
diff --git a/src/corelib/tools/qcache.qdoc b/src/corelib/tools/qcache.qdoc
index f075d2c..71e0483 100644
--- a/src/corelib/tools/qcache.qdoc
+++ b/src/corelib/tools/qcache.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$
**
****************************************************************************/