summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestcase.h
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-21 16:48:12 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-24 05:00:44 +0200
commitf49bd470990b838bb2c1a79605621e2d8c786a0b (patch)
tree2977e6f46a86f04a5809170473beb18fc2d2c0bf /src/testlib/qtestcase.h
parent47fc4e0f8cd332621b09f80d17b20f1689d1e642 (diff)
Remove legacy Symbian code from qtestlib.
Change-Id: Ia4ac52ce0b5f5a4ba1fcd6594daf424fd7208777 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/testlib/qtestcase.h')
-rw-r--r--src/testlib/qtestcase.h24
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)
{