From 0670770e98e3f914bd221205e1f4ec144b0757fb Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 29 Apr 2011 13:48:34 +0200 Subject: Fix another case where QVariant::Invalid should be QVariant::UserType Due to the QMetaType change before 4.7.0, if the typename of the variant is QVariant then the type itself is of UserType and not Invalid as it was previously. Reviewed-by: Martin Petersson --- src/activeqt/shared/qaxtypes.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp index f0a8ad8..b741620 100644 --- a/src/activeqt/shared/qaxtypes.cpp +++ b/src/activeqt/shared/qaxtypes.cpp @@ -265,7 +265,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type return QVariantToVARIANT(var, *arg.pvarVal, typeName, false); } - if (out && proptype == QVariant::Invalid && typeName == "QVariant") { + if (out && proptype == QVariant::UserType && typeName == "QVariant") { VARIANT *pVariant = new VARIANT; QVariantToVARIANT(var, *pVariant, QByteArray(), false); arg.vt = VT_VARIANT|VT_BYREF; -- cgit v0.12