diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-18 00:37:52 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-18 00:37:52 (GMT) |
| commit | d15888540f3b99c6add70106dda1dc1e262b8b00 (patch) | |
| tree | 2e22581ed9fac85df0f24b68f4e6d3115163c31f /src/testlib/qtestcase.cpp | |
| parent | 247952ec74cede6a69c718ef039e00b21a877e56 (diff) | |
| parent | 35f3438ae8a06aeba7b784df8de984d9d00aeff4 (diff) | |
| download | Qt-d15888540f3b99c6add70106dda1dc1e262b8b00.zip Qt-d15888540f3b99c6add70106dda1dc1e262b8b00.tar.gz Qt-d15888540f3b99c6add70106dda1dc1e262b8b00.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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); |