diff options
author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-05 08:52:24 (GMT) |
---|---|---|
committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-05 08:52:24 (GMT) |
commit | 6d25d222b2bb418139e123b59366db908ee3188a (patch) | |
tree | e00b67dcf860d5cd9bcdcaccf8bfc56f55269e94 /src/testlib/qtestcase.cpp | |
parent | cea8678e5fca8b33bbd5da057282888bc260a5c9 (diff) | |
parent | e50916796adc0dee112505ed617f9b83e99526fb (diff) | |
download | Qt-6d25d222b2bb418139e123b59366db908ee3188a.zip Qt-6d25d222b2bb418139e123b59366db908ee3188a.tar.gz Qt-6d25d222b2bb418139e123b59366db908ee3188a.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Diffstat (limited to 'src/testlib/qtestcase.cpp')
-rw-r--r-- | src/testlib/qtestcase.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 041f2db..af0df3e 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1469,7 +1469,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) #ifdef Q_OS_WIN chartLocation += QLatin1String("/../tools/qtestlib/chart/release/chart.exe"); #else - chartLocation += QLatin1String("/../tools/qtestlib/chart/chart"); + chartLocation += QLatin1String("/../tools/qtestlib/chart/chart"); #endif if (QFile::exists(chartLocation)) { QProcess p; @@ -1801,8 +1801,8 @@ COMPARE_IMPL2(quint64, %llu) #endif COMPARE_IMPL2(bool, %d) COMPARE_IMPL2(char, %c) -COMPARE_IMPL2(float, %g); -COMPARE_IMPL2(double, %lg); +COMPARE_IMPL2(float, %g) +COMPARE_IMPL2(double, %lg) /*! \internal */ |