QT_COORD_TYPE leftovers removal

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/kernel/qmetaobject.cpp b/src/core/kernel/qmetaobject.cpp
index 60634b2..b3c4fe4 100644 (file)
--- a/src/core/kernel/qmetaobject.cpp
+++ b/src/core/kernel/qmetaobject.cpp
@@ -2068,11 +2068,6 @@ QVariant::Type QMetaProperty::type() const
         if (enumMetaTypeId == 0)
             return QVariant::Int;
     }
-#ifdef QT_COORD_TYPE
-    // qreal metatype must be resolved at runtime.
-    if (strcmp(typeName(), "qreal") == 0)
-        return QVariant::Type(qMetaTypeId<qreal>());
-#endif
 
     return QVariant::UserType;
 }
@@ -2092,8 +2087,7 @@ int QMetaProperty::userType() const
     if (tp != QVariant::UserType)
         return tp;
     if (isEnumType()) {
-        int enumMetaTypeId = QMetaType::type(qualifiedName(menum).constData());
-        return enumMetaTypeId;
+        return QMetaType::type(qualifiedName(menum).constData());
     }
     return QMetaType::type(typeName());
 }

diff --git a/src/test/qtestcase.h b/src/test/qtestcase.h
index 1eaa8dc..b115ae1 100644 (file)
--- a/src/test/qtestcase.h
+++ b/src/test/qtestcase.h
@@ -219,22 +219,7 @@ namespace QTest
     template <typename T1, typename T2>
     bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);
 
-#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)
-    {
-        return qCompare<qreal>(t1, qreal(t2), actual, expected, file, line);
-    }
-
-    template <>
-    inline bool qCompare<float, qreal>(float const &t1, qreal const &t2, const char *actual,
-                                 const char *expected, const char *file, int line)
-    {
-        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)
+#if defined(QT_NO_FPU)
     template <>
     inline bool qCompare<qreal, double>(qreal const &t1, double const &t2, const char *actual,
                                  const char *expected, const char *file, int line)