Allow mapping from QMetaObject * to corresponding QmlType

This is needed in Bauhaus to get the QmlType of a parent QMetaObject.

Also, mark QmlType class as to be exported.

Reviewed-by: Aaron Kennedy

2 files changed, 14 insertions, 4 deletions

diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp
index 7825e5c..df61a82 100644
--- a/src/declarative/qml/qmlmetatype.cpp
+++ b/src/declarative/qml/qmlmetatype.cpp
@@ -95,8 +95,8 @@ struct QmlMetaTypeData
     QBitArray qmllists;
     QBitArray lists;
 };
-Q_GLOBAL_STATIC(QmlMetaTypeData, metaTypeData);
-Q_GLOBAL_STATIC(QReadWriteLock, metaTypeDataLock);
+Q_GLOBAL_STATIC(QmlMetaTypeData, metaTypeData)
+Q_GLOBAL_STATIC(QReadWriteLock, metaTypeDataLock)
 
 class QmlTypePrivate
 {
@@ -864,6 +864,14 @@ QmlType *QmlMetaType::qmlType(const QByteArray &name)
     return data->nameToType.value(name);
 }
 
+QmlType *QmlMetaType::qmlType(const QMetaObject *metaObject)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QmlMetaTypeData *data = metaTypeData();
+
+    return data->metaObjectToType.value(metaObject);
+}
+
 QList<QByteArray> QmlMetaType::qmlTypeNames()
 {
     QReadLocker lock(metaTypeDataLock());
diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h
index 7ab01a5..cc3887c 100644
--- a/src/declarative/qml/qmlmetatype.h
+++ b/src/declarative/qml/qmlmetatype.h
@@ -64,9 +64,11 @@ public:
 
     static bool copy(int type, void *data, const void *copy = 0);
 
-    static QmlType *qmlType(const QByteArray &);
     static QList<QByteArray> qmlTypeNames();
 
+    static QmlType *qmlType(const QByteArray &);
+    static QmlType *qmlType(const QMetaObject *);
+
     static QMetaProperty defaultProperty(const QMetaObject *);
     static QMetaProperty defaultProperty(QObject *);
     static QMetaMethod defaultMethod(const QMetaObject *);
@@ -108,7 +110,7 @@ public:
 };
 
 class QmlTypePrivate;
-class QmlType
+class Q_DECLARATIVE_EXPORT QmlType
 {
 public:
     QByteArray typeName() const;