De-inline QVariant(float)
All QVariant constructors are not inline, so change QVariant(float) as well. This allows for refactoring of QVariant during lifetime of Qt 5 without breaking QVariant(float) case. Change-Id: Icd1fc331a1ef8a2872be811aa7d1160406038f06 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
This commit is contained in:
parent
80462ee678
commit
57e750e620
@ -1448,6 +1448,9 @@ QVariant::QVariant(bool val)
|
||||
QVariant::QVariant(double val)
|
||||
: d(Double)
|
||||
{ d.data.d = val; }
|
||||
QVariant::QVariant(float val)
|
||||
: d(QMetaType::Float)
|
||||
{ d.data.f = val; }
|
||||
|
||||
QVariant::QVariant(const QByteArray &val)
|
||||
: d(ByteArray)
|
||||
|
@ -210,7 +210,7 @@ class Q_CORE_EXPORT QVariant
|
||||
QVariant(qulonglong ull);
|
||||
QVariant(bool b);
|
||||
QVariant(double d);
|
||||
QVariant(float f) { d.is_null = false; d.type = QMetaType::Float; d.data.f = f; }
|
||||
QVariant(float f);
|
||||
#ifndef QT_NO_CAST_FROM_ASCII
|
||||
QT_ASCII_CAST_WARN QVariant(const char *str);
|
||||
#endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user