Merge commit 'doc-team/4.7' into 4.7

1 files changed, 9 insertions, 8 deletions

diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index a83c27e..cc5afd2 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.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
@@ -749,9 +749,10 @@
     \section1 External Tools
 
     Tools for handling and visualizing test data are available as part of
-    the \l{qtestlib-tools} project on the Qt Labs Web site. These include
-    a tool for comparing performance data obtained from test runs and a
-    utility to generate Web-based graphs of performance data.
+    the qtestlib-tools project on the 
+	\l{http://labs.qt.nokia.com/}{http://labs.qt.nokia.com/}Qt Labs Web site.
+	These include a tool for comparing performance data obtained from test
+	runs and a utility to generate Web-based graphs of performance data.
 
     See the \l{qtestlib-tools Announcement} for more information on these
     tools and a simple graphing example.