diff options
| author | David Faure <faure@kde.org> | 2009-06-04 23:55:22 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-06-04 23:55:22 (GMT) |
| commit | ef0d1c839aed75201da10f8db7e515d9fb55bb16 (patch) | |
| tree | 5f00de5b8913379f9bb28df91782840c7efe6a2d /src/testlib | |
| parent | 58c5df4109acf44982c3a2a7b2318da52606232d (diff) | |
| download | Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.zip Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.gz Qt-ef0d1c839aed75201da10f8db7e515d9fb55bb16.tar.bz2 | |
All of Qt's own code compiles with -pedantic now (but pcre and webkit don't seem fixable easily)
Merge-request: 594
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 6 | ||||
| -rw-r--r-- | src/testlib/qtestresult.cpp | 2 |
2 files changed, 4 insertions, 4 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 */ diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp index 39759b5..0f21378 100644 --- a/src/testlib/qtestresult.cpp +++ b/src/testlib/qtestresult.cpp @@ -68,7 +68,7 @@ namespace QTest static const char *expectFailComment = 0; static int expectFailMode = 0; -}; +} void QTestResult::reset() { |