summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-17 11:52:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-17 11:52:35 (GMT)
commitcca7c5b40751e2192ba2c7c7422557eeb5672a17 (patch)
treedbff65640557790393937cc982d22a54213f3b6f /doc/src/snippets/code
parent0f8c867b1d5b13a56bd80f1819d4e71a9865b493 (diff)
parent1f475f97bfaef06967c2325c4ecf7fb076e5a1fc (diff)
downloadQt-cca7c5b40751e2192ba2c7c7422557eeb5672a17.zip
Qt-cca7c5b40751e2192ba2c7c7422557eeb5672a17.tar.gz
Qt-cca7c5b40751e2192ba2c7c7422557eeb5672a17.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix license text. Doc: fix a typo in QML/Qt UI integration
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r--doc/src/snippets/code/doc_src_fdl.qdoc10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/snippets/code/doc_src_fdl.qdoc b/doc/src/snippets/code/doc_src_fdl.qdoc
index 3c15dfe..b55e663 100644
--- a/doc/src/snippets/code/doc_src_fdl.qdoc
+++ b/doc/src/snippets/code/doc_src_fdl.qdoc
@@ -7,11 +7,11 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $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.
+** 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