Wrong property type (QVariant&) generated by ActiveQt

This was due to an incorrect type defenition in the typelibrary for a
particular COM object. Enven in such cases we should not generate an
incorrect type.

Task-number: 248612
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@nokia.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 1ec704ad23..44c3e9e1ee 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -1660,11 +1660,15 @@ private:
     QMap<QByteArray, Property> property_list;
     void addProperty(const QByteArray &type, const QByteArray &name, uint flags)
     {
+        QByteArray propertyType(type);
+        if (propertyType.endsWith("&"))
+            propertyType.chop(1);
+
         Property &prop = property_list[name];
-        if (!type.isEmpty() && type != "HRESULT") {
-            prop.type = replaceType(type);
-            if (prop.type != type)
-                prop.realType = type;
+        if (!propertyType.isEmpty() && propertyType != "HRESULT") {
+            prop.type = replaceType(propertyType);
+            if (prop.type != propertyType)
+                prop.realType = propertyType;
         }
         if (flags & Writable)
             flags |= Stored;