cleanup qreal type definition conditionals

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2017-05-20 17:05:02 +00:00
parent cec8cedeca
commit a51e760d26
2 changed files with 2 additions and 6 deletions

View file

@ -927,9 +927,7 @@ redefine to built-in booleans to make autotests work properly */
#endif #endif
// This logic must match the one in qmetatype.h // This logic must match the one in qmetatype.h
#if defined(QT_COORD_TYPE) #if defined(QT_NO_FPU)
typedef QT_COORD_TYPE qreal;
#elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM)
typedef float qreal; typedef float qreal;
#else #else
typedef double qreal; typedef double qreal;

View file

@ -88,9 +88,7 @@ public:
LastCoreExtType = QVariant, LastCoreExtType = QVariant,
// This logic must match the one in qglobal.h // This logic must match the one in qglobal.h
#if defined(QT_COORD_TYPE) #if defined(QT_NO_FPU)
QReal = 0,
#elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM)
QReal = Float, QReal = Float,
#else #else
QReal = Double, QReal = Double,