Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

6 files changed, 11 insertions, 15 deletions

diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf
index 1f0c35c389..2eea4f246a 100644
--- a/src/testlib/doc/qttestlib.qdocconf
+++ b/src/testlib/doc/qttestlib.qdocconf
@@ -2,22 +2,22 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtTestLib
 description             = Qt Test Reference Documentation
-url                     = http://qt-project.org/doc/qttestlib
-version                 = 5.1.0
+url                     = http://qt-project.org/doc/qt-$QT_VER/qttestlib
+version                 = $QT_VERSION
 
 examplesinstallpath     = testlib
 
 qhp.projects            = QtTestLib
 
 qhp.QtTestLib.file                = qttestlib.qhp
-qhp.QtTestLib.namespace           = org.qt-project.qttest.510
+qhp.QtTestLib.namespace           = org.qt-project.qttest.$QT_VERSION_TAG
 qhp.QtTestLib.virtualFolder       = qttest
 qhp.QtTestLib.indexTitle          = Qt Test
 qhp.QtTestLib.indexRoot           =
 
-qhp.QtTestLib.filterAttributes    = qttestlib 5.1.0 qtrefdoc
-qhp.QtTestLib.customFilters.Qt.name = QtTestLib 5.1.0
-qhp.QtTestLib.customFilters.Qt.filterAttributes = qttest 5.1.0
+qhp.QtTestLib.filterAttributes    = qttest $QT_VERSION qtrefdoc
+qhp.QtTestLib.customFilters.Qt.name = QtTest $QT_VERSION
+qhp.QtTestLib.customFilters.Qt.filterAttributes = qttest $QT_VERSION
 
 qhp.QtTestLib.subprojects         = classes
 qhp.QtTestLib.subprojects.classes.title = C++ Classes
diff --git a/src/testlib/doc/src/qt-webpages.qdoc b/src/testlib/doc/src/qt-webpages.qdoc
index a320318926..a0af232c03 100644
--- a/src/testlib/doc/src/qt-webpages.qdoc
+++ b/src/testlib/doc/src/qt-webpages.qdoc
@@ -36,7 +36,3 @@
     \externalpage http://qt.gitorious.org/qt-labs/qtestlib-tools
     \title qtestlib-tools
 */
-/*!
-    \externalpage http://qt.nokia.com/services-partners/partners/partner-directory
-    \title Partner Directory
-*/
diff --git a/src/testlib/doc/src/qttest-index.qdoc b/src/testlib/doc/src/qttest-index.qdoc
index fb0b639847..db42db1687 100644
--- a/src/testlib/doc/src/qttest-index.qdoc
+++ b/src/testlib/doc/src/qttest-index.qdoc
@@ -25,7 +25,7 @@
 **
 ****************************************************************************/
 /*!
-    \page qttestlib-index.html
+    \page qttest-index.html
     \title Qt Test
     \brief Provides classes for unit testing Qt applications and libraries.
 
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index 450dce46ab..796d817ae2 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -266,7 +266,7 @@ quint64 QTest::endBenchmarkMeasurement()
     Sets the benchmark result for this test function to \a result.
 
     Use this function if you want to report benchmark results without
-    using the QBENCHMARK macro. Use \a metric to specify how QTestLib
+    using the QBENCHMARK macro. Use \a metric to specify how Qt Test
     should interpret the results.
 
     The context for the result will be the test function name and any
diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h
index f64cb1d2db..ea5023c095 100644
--- a/src/testlib/qbenchmark.h
+++ b/src/testlib/qbenchmark.h
@@ -56,7 +56,7 @@ namespace QTest
 //  -------------
 //
 // The QBenchmarkIterationController class is not a part of the
-// QTestlib API. It exists purely as an implementation detail.
+// Qt Test API. It exists purely as an implementation detail.
 //
 //
 class Q_TESTLIB_EXPORT QBenchmarkIterationController
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 91da10fd94..f9f21c6a8f 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1837,7 +1837,7 @@ char *toHexRepresentation(const char *ba, int length)
      * running out of memory and flooding things when the byte array
      * is large.
      *
-     * maxLen can't be for example 200 because QTestLib is sprinkled with fixed
+     * maxLen can't be for example 200 because Qt Test is sprinkled with fixed
      * size char arrays.
      * */
     const int maxLen = 50;
@@ -2037,7 +2037,7 @@ FatalSignalHandler::~FatalSignalHandler()
     are executed if they exist. See \l{Creating a Test} for more details.
 
     Optionally, the command line arguments \a argc and \a argv can be provided.
-    For a list of recognized arguments, read \l {QTestLib Command Line Arguments}.
+    For a list of recognized arguments, read \l {Qt Test Command Line Arguments}.
 
     The following example will run all tests in \c MyTestObject: