summaryrefslogtreecommitdiffstats
path: root/src/activeqt/shared/qaxtypes.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/activeqt/shared/qaxtypes.cpp')
-rw-r--r--src/activeqt/shared/qaxtypes.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index a4658cd..755ab5a 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -243,7 +243,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
QVariant qvar = var;
// "type" is the expected type, so coerce if necessary
QVariant::Type proptype = typeName.isEmpty() ? QVariant::Invalid : QVariant::nameToType(typeName);
- if ((proptype == QVariant::UserType || proptype == QMetaType::QVariant) && !typeName.isEmpty()) {
+ if ((proptype == QVariant::UserType || proptype == int(QMetaType::QVariant)) && !typeName.isEmpty()) {
if (typeName == "short" || typeName == "char")
proptype = QVariant::Int;
else if (typeName == "float")
@@ -251,7 +251,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
}
if (proptype != QVariant::Invalid
&& proptype != QVariant::UserType
- && proptype != QMetaType::QVariant
+ && proptype != int(QMetaType::QVariant)
&& proptype != qvar.type()) {
if (qvar.canConvert(proptype))
qvar.convert(proptype);