From: Olivier Goffart <ogoffart@woboq.com>
Date: Mon, 27 Feb 2012 11:00:07 +0000 (+0100)
Subject: Detect QMetaType::QReal from the definition of qreal
X-Git-Tag: qt-v5.0.0-alpha1~724
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e2f295e27c10a9f3633344427959219caf63753d;p=profile%2Fivi%2Fqtbase.git

Detect QMetaType::QReal from the definition of qreal

Instead of relying to complex preprocessor expression that need to be
maintained to be kept the same as in qglobal.h

This aslo fix the case where QT_COORD_TYPE is defined (It is meant to be
defined to float or double, any other type would not make sense)

So now there should hopefully be only one place to change if one need to
adjust the type of qreal

Change-Id: I778312112603173562dbe675ab491b53d6cd2174
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
---

diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 4e75e14..beb7294 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -200,14 +200,7 @@ public:
         LastWidgetsType = QSizePolicy,
         HighestInternalId = LastWidgetsType,
 
-// This logic must match the one in qglobal.h
-#if defined(QT_COORD_TYPE)
-        QReal = 0,
-#elif defined(QT_NO_FPU) || defined(Q_PROCESSOR_ARM) || defined(Q_OS_WINCE)
-        QReal = Float,
-#else
-        QReal = Double,
-#endif
+        QReal = sizeof(qreal) == sizeof(double) ? Double : Float,
 
         User = 256
     };