diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-22 03:03:42 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-22 03:03:42 +0200 |
| commit | 371c0e8389cebc5bd4e9726c31596ad3b56b33fc (patch) | |
| tree | f7959d1a7918907e38c2f3623cf6cf7a9b5389f0 | |
| parent | 9f68ebfd2172dc807fb3e24c36ae8c0bec03dad0 (diff) | |
| parent | 52637083eeaa1ab4b9468813a28d40feea81ab5e (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1
Change-Id: I475d823961bd3483cd3f27dcf985dfabc5cb0d70
| -rw-r--r-- | src/activeqt/container/qaxbase.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp index 9c0e0d9..722a389 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -3682,7 +3682,10 @@ int QAxBase::internalInvoke(QMetaObject::Call call, int index, void **v) // get return value if (hres == S_OK && ret.vt != VT_EMPTY) { QVariantToVoidStar(VARIANTToQVariant(ret, slot.typeName()), v[0], slot.typeName()); - clearVARIANT(&ret); + if (ret.vt != VT_DISPATCH) + clearVARIANT(&ret); + else + VariantInit(&ret); } // update out parameters |