summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io/qfileinfo
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-08-31 13:24:37 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-08-31 13:26:27 +0200
commitc5ea7fd39a737ee16e82a6ef49a3149758b96e2b (patch)
treef14c1b1c25661bbd78f8ffb1de9a3c64a5319232 /tests/auto/corelib/io/qfileinfo
parent94355ca15a4d451f4a4b858240e2c1a96e26537b (diff)
Fix autotests to build on Windows.
Basically breakage by <windows.h> being included from the OpenGL parts of <QtGui/QtGui> included from <QtTest/QtTest>. Change-Id: Id285fb89c64bf77e2408faac5688acd085579351 Reviewed-on: http://codereview.qt.nokia.com/3952 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/corelib/io/qfileinfo')
-rw-r--r--tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index c3d106d2fd..9c9c9ec282 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -1388,7 +1388,7 @@ void tst_QFileInfo::ntfsJunctionPointsAndSymlinks_data()
wchar_t errstr[0x100];
DWORD count = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM,
0, err, 0, errstr, 0x100, 0);
- QString error(QString::fromUtf16(errstr, count));
+ QString error(QString::fromWCharArray(errstr, count));
qWarning() << error;
//we need at least one data set for the test not to assert fail when skipping _data function
QDir target("target");