diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:08:32 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:08:32 +0200 |
| commit | b1b31968253d349e17828145ef9d1a706ab4dd53 (patch) | |
| tree | 7b23c70d802fcf9fca49099c8d7bfde26221f308 | |
| parent | 6723afaa7ba23cc4698bfb0e247b9e7209cd2967 (diff) | |
| parent | 7371bac96ba0962b79b59994e4e9b9adf4ee17e8 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I65a7c4f0ef8522d7099ba921c310d45045c830e8
| -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(); |