summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-05-14 14:45:17 (GMT)
committerMorten Sørvig <msorvig@trolltech.com>2009-05-14 14:45:17 (GMT)
commitd8a5799de2be228c10faaaa3e6f4c7eb07793b9c (patch)
tree9aebe68cbcafe2618e8bc043b7ab270b97dc402c
parenta2f9d610c5cfd80819dc9a11c9452fcadba6ebb4 (diff)
downloadQt-d8a5799de2be228c10faaaa3e6f4c7eb07793b9c.zip
Qt-d8a5799de2be228c10faaaa3e6f4c7eb07793b9c.tar.gz
Qt-d8a5799de2be228c10faaaa3e6f4c7eb07793b9c.tar.bz2
Find chart.exe on windows.
-rw-r--r--src/testlib/qtestcase.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 8c76c5d..041f2db 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1465,8 +1465,12 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
#if !defined(QT_NO_PROCESS) || !defined(QT_NO_SETTINGS)
if (QBenchmarkGlobalData::current->createChart) {
- QString chartLocation = QLibraryInfo::location(QLibraryInfo::BinariesPath)
- + QLatin1String("/../tools/qtestlib/chart/chart");
+ QString chartLocation = QLibraryInfo::location(QLibraryInfo::BinariesPath);
+#ifdef Q_OS_WIN
+ chartLocation += QLatin1String("/../tools/qtestlib/chart/release/chart.exe");
+#else
+ chartLocation += QLatin1String("/../tools/qtestlib/chart/chart");
+#endif
if (QFile::exists(chartLocation)) {
QProcess p;
p.setProcessChannelMode(QProcess::ForwardedChannels);