reuse float/double member of QVariant for qreal [ci reset]

Signed-off-by: Ivailo Monev <[email protected]>
fluxer · Aug 10, 2021 · 9a1a182 · 9a1a182
1 parent b4bee2b
commit 9a1a182
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/core/kernel/qvariant.cpp b/src/core/kernel/qvariant.cpp
@@ -2451,7 +2451,11 @@ float QVariant::toFloat(bool *ok) const
 */
 qreal QVariant::toReal(bool *ok) const
 {
-    return qNumVariantToHelper<qreal>(d, handler, ok, d.data.real);
+#if defined(QT_NO_FPU)
+    return qNumVariantToHelper<qreal>(d, handler, ok, d.data.f);
+#else
+    return qNumVariantToHelper<qreal>(d, handler, ok, d.data.d);
+#endif
 }
 
 /*!

diff --git a/src/core/kernel/qvariant.h b/src/core/kernel/qvariant.h
@@ -299,7 +299,6 @@ class Q_CORE_EXPORT QVariant
             bool b;
             double d;
             float f;
-            qreal real;
             qlonglong ll;
             qulonglong ull;
             QObject *o;