diff options
Diffstat (limited to 'src/testlib/qtestcase.h')
| -rw-r--r-- | src/testlib/qtestcase.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 4d20de6fcd..0c06f3a095 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -275,7 +275,7 @@ namespace QTest return qCompare<qreal>(qreal(t1), t2, actual, expected, file, line); } -#elif defined(QT_COORD_TYPE) || defined(QT_ARCH_ARM) || defined(QT_NO_FPU) || defined(QT_ARCH_WINDOWSCE) || defined(QT_ARCH_SYMBIAN) +#elif defined(QT_COORD_TYPE) || defined(QT_ARCH_ARM) || defined(QT_NO_FPU) || defined(QT_ARCH_WINDOWSCE) template <> inline bool qCompare<qreal, double>(qreal const &t1, double const &t2, const char *actual, const char *expected, const char *file, int line) @@ -331,28 +331,6 @@ namespace QTest return compare_string_helper(t1, t2, actual, expected, file, line); } #else /* QTEST_NO_SPECIALIZATIONS */ - -// In Symbian we have QTEST_NO_SPECIALIZATIONS defined, but still float related specialization -// should be used. If QTEST_NO_SPECIALIZATIONS is enabled we get ambiguous overload errors. -#if defined(QT_ARCH_SYMBIAN) - template <typename T1, typename T2> - bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int); - - template <> - inline bool qCompare<qreal, double>(qreal const &t1, double const &t2, const char *actual, - const char *expected, const char *file, int line) - { - return qCompare<float>(float(t1), float(t2), actual, expected, file, line); - } - - template <> - inline bool qCompare<double, qreal>(double const &t1, qreal const &t2, const char *actual, - const char *expected, const char *file, int line) - { - return qCompare<float>(float(t1), float(t2), actual, expected, file, line); - } -#endif - inline bool qCompare(const char *t1, const char *t2, const char *actual, const char *expected, const char *file, int line) { |