From 4fc230ab158156980aa737d6bb907c0865bc5a7d Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin+qt@viroteck.net>
Date: Thu, 4 Jul 2013 16:41:51 +0200
Subject: [PATCH] benchmarks: Re-enable QFileInfo build by removing
 canonicalFileNamePerformance.

QFSFileEnginePrivate::canonicalized has been gone for a very, very long time now
(since d3b152ba1e3cd38dd675c801474105d518bacb44 in Qt 4).

This also fixes a build failure in the code on Windows.

Change-Id: I81f5e0c1d644b1b4d75644626eb394a663535387
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 tests/benchmarks/corelib/io/io.pro             |  2 +-
 tests/benchmarks/corelib/io/qfileinfo/main.cpp | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/tests/benchmarks/corelib/io/io.pro b/tests/benchmarks/corelib/io/io.pro
index 863843f2c6..487171ac5e 100644
--- a/tests/benchmarks/corelib/io/io.pro
+++ b/tests/benchmarks/corelib/io/io.pro
@@ -3,7 +3,7 @@ SUBDIRS = \
         qdir \
         qdiriterator \
         qfile \
-        #qfileinfo \    # FIXME: broken
+        qfileinfo \
         qiodevice \
         qprocess \
         qtemporaryfile
diff --git a/tests/benchmarks/corelib/io/qfileinfo/main.cpp b/tests/benchmarks/corelib/io/qfileinfo/main.cpp
index d958103281..2e63795978 100644
--- a/tests/benchmarks/corelib/io/qfileinfo/main.cpp
+++ b/tests/benchmarks/corelib/io/qfileinfo/main.cpp
@@ -52,7 +52,6 @@ class qfileinfo : public QObject
 {
     Q_OBJECT
 private slots:
-    void canonicalFileNamePerformance();
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     void symLinkTargetPerformanceLNK();
     void symLinkTargetPerformanceMounpoint();
@@ -71,18 +70,6 @@ void qfileinfo::cleanupTestCase()
 {
 }
 
-void qfileinfo::canonicalFileNamePerformance()
-{
-    QString appPath = QCoreApplication::applicationFilePath();
-    QFSFileEnginePrivate::canonicalized(appPath); // warmup
-    QFSFileEnginePrivate::canonicalized(appPath); // more warmup
-    QBENCHMARK {
-        for (int i = 0; i < 5000; i++) {
-            QFSFileEnginePrivate::canonicalized(appPath);
-        }
-    }
-}
-
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 void qfileinfo::symLinkTargetPerformanceLNK()
 {
@@ -102,7 +89,7 @@ void qfileinfo::symLinkTargetPerformanceMounpoint()
 {
     wchar_t buffer[MAX_PATH];
     QString rootPath = QDir::toNativeSeparators(QDir::rootPath());
-    QVERIFY(GetVolumeNameForVolumeMountPointW(rootPath.utf16(), buffer, MAX_PATH));
+    QVERIFY(GetVolumeNameForVolumeMountPointW((LPCWSTR)rootPath.utf16(), buffer, MAX_PATH));
     QString rootVolume = QString::fromWCharArray(buffer);
     QString mountpoint = "mountpoint";
     rootVolume.replace("\\\\?\\","\\??\\");