From 4836d809f5dc3fc9e978ef630c0e5c8847c171a7 Mon Sep 17 00:00:00 2001
From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Date: Wed, 5 Jan 2011 15:19:07 +0100
Subject: 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
---
 src/activeqt/container/qaxbase.cpp | 3 +--
 1 file changed, 1 insertion(+), 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;
-- 
cgit v0.12