summaryrefslogtreecommitdiffstats
path: root/src/activeqt
diff options
context:
space:
mode:
authorAndy Shaw <qt-info@nokia.com>2011-04-29 11:48:34 (GMT)
committerAndy Shaw <qt-info@nokia.com>2011-04-29 11:48:34 (GMT)
commit0670770e98e3f914bd221205e1f4ec144b0757fb (patch)
tree241a4538df949610419d4d0e753e1130c834301b /src/activeqt
parent63e89c45fcc07759c928231ac27cc25928116d45 (diff)
downloadQt-0670770e98e3f914bd221205e1f4ec144b0757fb.zip
Qt-0670770e98e3f914bd221205e1f4ec144b0757fb.tar.gz
Qt-0670770e98e3f914bd221205e1f4ec144b0757fb.tar.bz2
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
Diffstat (limited to 'src/activeqt')
-rw-r--r--src/activeqt/shared/qaxtypes.cpp2
1 files changed, 1 insertions, 1 deletions
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;