diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-09-17 15:22:00 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-09-17 15:22:00 (GMT) |
| commit | b7923d48fb6d755d4563eeed0e7f3cbc774d69d5 (patch) | |
| tree | ec8bb06f58f714d0b799164693e93bf0d51b6bcf /src/testlib | |
| parent | e6dbbd0398d70ee64a3b8129e9621cfa15d70f8c (diff) | |
| parent | a62506aae40ede3fd8030312321759f669458909 (diff) | |
| download | Qt-b7923d48fb6d755d4563eeed0e7f3cbc774d69d5.zip Qt-b7923d48fb6d755d4563eeed0e7f3cbc774d69d5.tar.gz Qt-b7923d48fb6d755d4563eeed0e7f3cbc774d69d5.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qpainter/tst_qpainter.cpp
tests/auto/qtwidgets/tst_qtwidgets.cpp
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 3980883..1831728 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -220,7 +220,7 @@ namespace QTest template <typename T1, typename T2> bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int); -#if defined(QT_ARCH_WINDOWSCE) && defined(QT_COORD_TYPE) +#if defined(QT_COORD_TYPE) && (defined(QT_ARCH_ARM) || defined(QT_NO_FPU) || defined(QT_ARCH_WINDOWSCE)) template <> inline bool qCompare<qreal, float>(qreal const &t1, float const &t2, const char *actual, const char *expected, const char *file, int line) |