From 0a1e2e645bc1952c89d6ef560eccbe68e51f6ca8 Mon Sep 17 00:00:00 2001
From: ninerider <qt-info@nokia.com>
Date: Mon, 22 Feb 2010 09:34:19 +0100
Subject: Fixes for the Windows Mobile plattform

These fixes mainly concern compiling issues.
---
 tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp        | 2 +-
 tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro                | 2 +-
 .../gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp     | 7 +++++++
 .../gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp    | 6 ++++++
 .../gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp   | 6 ++++++
 .../qfile_vs_qnetworkaccessmanager.pro                             | 2 +-
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp b/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp
index b325250..1238804 100644
--- a/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp
+++ b/tests/benchmarks/corelib/io/qdir/10000/bench_qdir_10000.cpp
@@ -156,6 +156,7 @@ private slots:
     }
 
     void sizeSpeedWithoutFilterLowLevel() {
+        QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
 #ifdef Q_OS_WIN
         const wchar_t *dirpath = (wchar_t*)testdir.absolutePath().utf16();
         wchar_t appendedPath[MAX_PATH];
@@ -173,7 +174,6 @@ private slots:
         }
         FindClose(hSearch);
 #else
-        QDir testdir(QDir::tempPath() + QLatin1String("/test_speed"));
         DIR *dir = opendir(qPrintable(testdir.absolutePath()));
         QVERIFY(dir);
 
diff --git a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro
index 295cb50..eca619f 100644
--- a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro
+++ b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 TEMPLATE = app
-TARGET = qfileinfo
+TARGET = tst_qfileinfo
 DEPENDPATH += .
 INCLUDEPATH += .
 
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
index 1028f42..6c4ca08 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/chipTest/view.cpp
@@ -42,7 +42,14 @@
 #include "view.h"
 
 #include <QtGui>
+
+#ifdef Q_WS_WIN
+#define CALLGRIND_START_INSTRUMENTATION  {}
+#define CALLGRIND_STOP_INSTRUMENTATION   {}
+#else
 #include "valgrind/callgrind.h"
+#endif
+
 #ifndef QT_NO_OPENGL
 #include <QtOpenGL>
 #endif
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
index 527713f..63b0da9 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/moveItems/main.cpp
@@ -39,7 +39,13 @@
 **
 ****************************************************************************/
 #include <QtGui>
+
+#ifdef Q_WS_WIN
+#define CALLGRIND_START_INSTRUMENTATION  {}
+#define CALLGRIND_STOP_INSTRUMENTATION   {}
+#else
 #include "valgrind/callgrind.h"
+#endif
 
 #ifdef Q_WS_X11
 extern void qt_x11_wait_for_window_manager(QWidget *);
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
index 7419206..3f30393 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/benchapps/scrolltest/main.cpp
@@ -39,7 +39,13 @@
 **
 ****************************************************************************/
 #include <QtGui>
+
+#ifdef Q_WS_WIN
+#define CALLGRIND_START_INSTRUMENTATION  {}
+#define CALLGRIND_STOP_INSTRUMENTATION   {}
+#else
 #include "valgrind/callgrind.h"
+#endif
 
 class ItemMover : public QObject
 {
diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro
index 99d1935..89f5d31 100644
--- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro
+++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 TEMPLATE = app
-TARGET = qfile_vs_qnetworkaccessmanager
+TARGET = tst_qfile_vs_qnetworkaccessmanager
 DEPENDPATH += .
 INCLUDEPATH += .
 
-- 
cgit v0.12