summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrasanth Ullattil <prasanth.ullattil@nokia.com>2011-01-05 14:19:07 (GMT)
committerPrasanth Ullattil <prasanth.ullattil@nokia.com>2011-01-05 14:38:12 (GMT)
commit4836d809f5dc3fc9e978ef630c0e5c8847c171a7 (patch)
tree572c73e27c0c8273cd58d6b5d4afbd560988d1e7
parent85e44320185ceebf948505497ffb29e5fe38c71a (diff)
downloadQt-4836d809f5dc3fc9e978ef630c0e5c8847c171a7.zip
Qt-4836d809f5dc3fc9e978ef630c0e5c8847c171a7.tar.gz
Qt-4836d809f5dc3fc9e978ef630c0e5c8847c171a7.tar.bz2
Add support for QMetaType::QVariant in ActiveQt
Previously when we convert the typename "QVariant" to QVaraint::Type, it returns QVariant::Invalid. From Qt 4.7 onwards, it will return QVariant::UserType. Task-number: QTBUG-15157 Reviewed-by: Martin Petersson
-rw-r--r--src/activeqt/container/qaxbase.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 7692749..c29eac6 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -1671,12 +1671,11 @@ private:
QVariant::Type vartype = QVariant::nameToType(prop.type);
switch(vartype) {
case QVariant::Invalid:
+ case QVariant::UserType:
if (prop.type == "QVariant") {
prop.typeId |= 0xff << 24;
break;
}
- // fall through
- case QVariant::UserType:
if (QMetaType::type(prop.type) == -1)
qWarning("QAxBase: Unsupported property type: %s", prop.type.data());
break;