diff options
author | Andy Shaw <andy.shaw@digia.com> | 2013-07-18 06:58:05 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-19 09:45:11 +0200 |
commit | 7371bac96ba0962b79b59994e4e9b9adf4ee17e8 (patch) | |
tree | 6cdafb823e44d93c0f012f260dfc411dcf3baa16 | |
parent | 35e1b7dd8fef475a6bf7daf4067bae08dd635c11 (diff) |
Use QMetaType::Float as this is what type() returns now
QVariant::Type is obsolete and type() is really returning a
QMetaType::Type instead. So for the float case we just add that in to
ensure it works as before in Qt 4.x.
Change-Id: I190a4eb2c37492386ea202fc52d39b431e5f02ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r-- | src/activeqt/shared/qaxtypes.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp index 755ab5a..060d374 100644 --- a/src/activeqt/shared/qaxtypes.cpp +++ b/src/activeqt/shared/qaxtypes.cpp @@ -388,6 +388,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type } } break; + case QMetaType::Float: case QVariant::Double: if (out && arg.vt == (VT_R8|VT_BYREF)) { *arg.pdblVal = qvar.toDouble(); |