diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-11 15:14:13 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-11 16:42:01 +0200 |
commit | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (patch) | |
tree | 14810e4d0168c0cc3d69cb286574bf28375c07bc /tests/benchmarks | |
parent | b06304e164ba47351fa292662c1e6383c081b5ca (diff) | |
parent | 7b9d6cf844ece18fef884f51117e25ad4ac31db5 (diff) |
Merge branch 'stable' into dev
Conflicts:
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/json/qjsonwriter.cpp
src/corelib/kernel/qeventdispatcher_blackberry.cpp
src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
Diffstat (limited to 'tests/benchmarks')
-rw-r--r-- | tests/benchmarks/corelib/io/io.pro | 2 | ||||
-rw-r--r-- | 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("\\\\?\\","\\??\\"); |