4 files changed, 7 insertions, 5 deletions
diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf
index 250d237f12..92e5c97aab 100644
--- a/src/testlib/doc/qttestlib.qdocconf
+++ b/src/testlib/doc/qttestlib.qdocconf
@@ -27,7 +27,7 @@ qhp.QtTestLib.subprojects.classes.sortPages = true
 
 tagfile                 = ../../../doc/qttestlib/qttestlib.tags
 
-depends                 += qtcore qtdoc qtwidgets qtgui qtquick
+depends                 += qtcore qtdoc qtwidgets qtgui qmake qtquick
 
 headerdirs  += ..
 
diff --git a/src/testlib/doc/src/qttest-index.qdoc b/src/testlib/doc/src/qttest-index.qdoc
index 4cf0726429..8dc51f8696 100644
--- a/src/testlib/doc/src/qttest-index.qdoc
+++ b/src/testlib/doc/src/qttest-index.qdoc
@@ -56,7 +56,7 @@
 
     \list
         \li \l{Qt Test C++ Classes}{C++ Classes}
-        \li \l{Qt Quick Test}{QML Types}
+        \li \l{Qt Quick Test QML Types}{QML Types}
     \endlist
 
 */
diff --git a/src/testlib/doc/src/qttestlib-manual.qdoc b/src/testlib/doc/src/qttestlib-manual.qdoc
index 613d2c220c..bdd9769175 100644
--- a/src/testlib/doc/src/qttestlib-manual.qdoc
+++ b/src/testlib/doc/src/qttestlib-manual.qdoc
@@ -120,7 +120,7 @@
 
     \snippet code/doc_src_qtestlib.pro 2
 
-    See \l{qmake Common Projects#building-a-testcase}{the qmake manual} for
+    See the \l{Building a Testcase}{qmake manual} for
     more information about \c{make check}.
 
     If you are using other build tools, make sure that you add the location
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index d94b2bf85c..a9abca0ef8 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -46,8 +46,10 @@
 #include <QtTest/qtestdata.h>
 #include <QtTest/qtestassert.h>
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <wchar.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -268,8 +270,8 @@ bool QTestResult::compare(bool success, const char *failureMsg,
     if (success && QTest::expectFailMode) {
         qsnprintf(msg, 1024, "QCOMPARE(%s, %s) returned TRUE unexpectedly.", actual, expected);
     } else if (val1 || val2) {
-        size_t len1 = strlen(actual);
-        size_t len2 = strlen(expected);
+        size_t len1 = mbstowcs(NULL, actual, 0);
+        size_t len2 = mbstowcs(NULL, expected, 0);
         qsnprintf(msg, 1024, "%s\n   Actual   (%s)%*s %s\n   Expected (%s)%*s %s",
                   failureMsg,
                   actual, qMax(len1, len2) - len1 + 1, ":", val1 ? val1 : "<null>",