diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-18 13:25:43 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-18 13:25:43 (GMT) |
| commit | 86edc526684d80e405bcd1c63b5a314b70408679 (patch) | |
| tree | dfe6a3e989d4468d852019d00f062c4b8d48d036 /src/testlib/qtestcase.cpp | |
| parent | 5c42e4328cc2bea53dc4d31eb3f4d10d42ac6ee1 (diff) | |
| parent | 7e4d4474d10cb17047d95e3a4820388468c74507 (diff) | |
| download | Qt-86edc526684d80e405bcd1c63b5a314b70408679.zip Qt-86edc526684d80e405bcd1c63b5a314b70408679.tar.gz Qt-86edc526684d80e405bcd1c63b5a314b70408679.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/testlib/qtestcase.cpp')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 8 |
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); |