Initial import from qtquick2.

Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469

1 files changed, 12 insertions, 0 deletions

diff --git a/src/declarative/qml/qdeclarativeinfo.cpp b/src/declarative/qml/qdeclarativeinfo.cpp
index 7c8f73bc61..8449578c65 100644
--- a/src/declarative/qml/qdeclarativeinfo.cpp
+++ b/src/declarative/qml/qdeclarativeinfo.cpp
@@ -129,6 +129,18 @@ QDeclarativeInfo::~QDeclarativeInfo()
                     int marker = typeName.indexOf(QLatin1String("_QMLTYPE_"));
                     if (marker != -1)
                         typeName = typeName.left(marker);
+
+                    marker = typeName.indexOf(QLatin1String("_QML_"));
+                    if (marker != -1) {
+                        typeName = typeName.left(marker) + "*";
+                        type = QDeclarativeMetaType::qmlType(QMetaType::type(typeName.toLatin1()));
+                        if (type) {
+                            typeName = QLatin1String(type->qmlTypeName());
+                            int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
+                            if (lastSlash != -1)
+                                typeName = typeName.mid(lastSlash+1);
+                        }
+                    }
                 }
 
                 d->buffer.prepend(QLatin1String("QML ") + typeName + QLatin1String(": "));