From 98ebac7ede5aa4c16e6f204e0d37d9835a6fad6c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 29 Nov 2011 12:49:24 +0100
Subject: Fix compilation of Benchmark tests on Windows.

Change-Id: I92186f916792d110f22b23525b673ef006e19046
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
---
 tests/benchmarks/corelib/io/qdiriterator/main.cpp                | 5 +++--
 tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp | 3 +--
 tests/benchmarks/corelib/io/qfile/main.cpp                       | 1 -
 tests/benchmarks/corelib/tools/tools.pro                         | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'tests/benchmarks/corelib')

diff --git a/tests/benchmarks/corelib/io/qdiriterator/main.cpp b/tests/benchmarks/corelib/io/qdiriterator/main.cpp
index 319b707948..cecd0de1da 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/main.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/main.cpp
@@ -44,7 +44,6 @@
 
 #ifdef Q_OS_WIN
 #   include <windows.h>
-#   include <atlbase.h>
 #else
 #   include <sys/stat.h>
 #   include <sys/types.h>
@@ -176,7 +175,9 @@ void tst_qdiriterator::posix()
     QString path(dirpath);
     QBENCHMARK {
 #ifdef Q_OS_WIN
-        count = posix_helper(path.utf16());
+        wchar_t wPath[MAX_PATH];
+        path.toWCharArray(wPath);
+        count = posix_helper(wPath);
 #else
         count = posix_helper(dirpath.constData());
 #endif
diff --git a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
index 935bccd630..8c9f1cc423 100644
--- a/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
+++ b/tests/benchmarks/corelib/io/qdiriterator/qfilesystemiterator.cpp
@@ -98,7 +98,6 @@
 
 #ifdef Q_OS_WIN
 #   include <windows.h>
-#   include <atlbase.h>
 #else
 #   include <sys/stat.h>
 #   include <sys/types.h>
@@ -229,7 +228,7 @@ void QFileSystemIteratorPrivate::pushSubDirectory(const QByteArray &path)
 
 #ifdef Q_OS_WIN
     wchar_t szSearchPath[MAX_PATH];
-    wcscpy(szSearchPath, QString(path).utf16());
+    QString::fromAscii(path).toWCharArray(szSearchPath);
     wcscat(szSearchPath, L"\\*");
     HANDLE dir = FindFirstFile(szSearchPath, &m_fileSearchResult);
     m_bFirstSearchResult = true;
diff --git a/tests/benchmarks/corelib/io/qfile/main.cpp b/tests/benchmarks/corelib/io/qfile/main.cpp
index fa13aa977f..11cd5c76b2 100644
--- a/tests/benchmarks/corelib/io/qfile/main.cpp
+++ b/tests/benchmarks/corelib/io/qfile/main.cpp
@@ -51,7 +51,6 @@
 
 #ifdef Q_OS_WIN
 # include <windows.h>
-# include <atlbase.h>
 #endif
 
 #define BUFSIZE 1024*512
diff --git a/tests/benchmarks/corelib/tools/tools.pro b/tests/benchmarks/corelib/tools/tools.pro
index 1576ccceaf..d5bf8301f9 100644
--- a/tests/benchmarks/corelib/tools/tools.pro
+++ b/tests/benchmarks/corelib/tools/tools.pro
@@ -11,3 +11,5 @@ SUBDIRS = \
         qstringbuilder \
         qstringlist \
         qvector
+
+!*g++*: SUBDIRS -= qstring
-- 
cgit v1.2.3