From a51e760d2607e2100c6ba86b8db6f3dff1db1937 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 20 May 2017 17:05:02 +0000 Subject: [PATCH] cleanup qreal type definition conditionals Signed-off-by: Ivailo Monev --- src/core/global/qglobal.h.cmake | 4 +--- src/core/kernel/qmetatype.h | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/core/global/qglobal.h.cmake b/src/core/global/qglobal.h.cmake index cbb2ad0d4..f5b338908 100644 --- a/src/core/global/qglobal.h.cmake +++ b/src/core/global/qglobal.h.cmake @@ -927,9 +927,7 @@ redefine to built-in booleans to make autotests work properly */ #endif // This logic must match the one in qmetatype.h -#if defined(QT_COORD_TYPE) -typedef QT_COORD_TYPE qreal; -#elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM) +#if defined(QT_NO_FPU) typedef float qreal; #else typedef double qreal; diff --git a/src/core/kernel/qmetatype.h b/src/core/kernel/qmetatype.h index 44dd77085..2f4dd7cbb 100644 --- a/src/core/kernel/qmetatype.h +++ b/src/core/kernel/qmetatype.h @@ -88,9 +88,7 @@ public: LastCoreExtType = QVariant, // This logic must match the one in qglobal.h -#if defined(QT_COORD_TYPE) - QReal = 0, -#elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM) +#if defined(QT_NO_FPU) QReal = Float, #else QReal = Double,