Remove registerMetaType from QWrappedObject and inheriting classes

Change-Id: I958ab7f269c9675b9e6a752738cd8795fb49e650
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

602 files changed, 316 insertions, 4694 deletions

diff --git a/examples/uml/qtumleditor/mainwindow.cpp b/examples/uml/qtumleditor/mainwindow.cpp
index 9af70c3a..b4933576 100644
--- a/examples/uml/qtumleditor/mainwindow.cpp
+++ b/examples/uml/qtumleditor/mainwindow.cpp
@@ -4,7 +4,7 @@
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMessageBox>
 
-#include <QtMof/QtMofMetaModel>
+#include <QtMof/QMofMetaModel>
 
 #include "wrappedobjectmodel.h"
 #include "wrappedobjectpropertymodel.h"
@@ -18,7 +18,7 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     ui->setupUi(this);
 
-    QtMofMetaModel::init();
+    QMofMetaModel::init();
 
     ui->wrappedObjectView->setModel(_wrappedObjectModel);
 
diff --git a/examples/uml/qtumleditor/wrappedobjectpropertymodel.cpp b/examples/uml/qtumleditor/wrappedobjectpropertymodel.cpp
index 94c3b846..12997398 100644
--- a/examples/uml/qtumleditor/wrappedobjectpropertymodel.cpp
+++ b/examples/uml/qtumleditor/wrappedobjectpropertymodel.cpp
@@ -84,7 +84,6 @@ QVariant WrappedObjectPropertyModel::data(const QModelIndex &index, int role) co
                     if (index.parent().row() != -1 && metaPropertyInfo) {
                         QMetaProperty metaProperty = metaPropertyInfo->metaProperty;
                         QWrappedObject *propertyWrappedObject = metaPropertyInfo->propertyWrappedObject;
-                        propertyWrappedObject->registerMetaTypes();
                         QString typeName = metaProperty.typeName();
                         QVariant variant = metaProperty.read(propertyWrappedObject);
                         if (metaProperty.type() == QVariant::String) {
diff --git a/examples/uml/xmi-read/main.cpp b/examples/uml/xmi-read/main.cpp
index b86772b9..39c16a92 100644
--- a/examples/uml/xmi-read/main.cpp
+++ b/examples/uml/xmi-read/main.cpp
@@ -1,20 +1,15 @@
-#include <QtWrappedObjects>
+#include <QtWrappedObjects/QtWrappedObjects>
 
 #include <QtMof/QXmiReader>
-using QtMof::QXmiReader;
 #include <QtMof/QXmiWriter>
-using QtMof::QXmiWriter;
-
-#include <QtMof/QtMofMetaModel>
 
-#include <QtCore/QDebug>
+using QtMof::QXmiReader;
+using QtMof::QXmiWriter;
 
 using namespace QtWrappedObjects;
 
 int main ()
 {
-    QtMof::QtMofMetaModel::init();
-
     QFile file("test.xmi");
 
     if (!file.open(QFile::ReadOnly | QFile::Text)) {
diff --git a/scripts/templates/class.cpp b/scripts/templates/class.cpp
index 5b7fcfa4..710704df 100644
--- a/scripts/templates/class.cpp
+++ b/scripts/templates/class.cpp
@@ -743,22 +743,6 @@ ${operation.return}${class.name}::${operation.name}([%- FOREACH parameter IN ope
 }
 [% END -%]
 
-void ${class.name}::registerMetaTypes() const
-{
-[% FOREACH forwarddecl IN class.forwarddecl -%]
-[%- IF forwarddecl.content != class.name -%]
-    qRegisterMetaType<${forwarddecl.content} *>("${forwarddecl.content} *");
-    qRegisterMetaType<QSet<${forwarddecl.content} *>>("QSet<${forwarddecl.content} *>");
-    qRegisterMetaType<QList<${forwarddecl.content} *>>("QList<${forwarddecl.content} *>");
-
-[% END -%]
-[%- END -%]
-    [% IF class.superclass.size == 1 %]${class.superclass.0.name.split('/').last}[% ELSE %]QWrappedObject[% END %]::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void ${class.name}::setPropertyData()
 {
 [%- FOREACH attribute IN class.attribute.values %]
diff --git a/scripts/templates/class.h b/scripts/templates/class.h
index e0476669..d91abd7a 100644
--- a/scripts/templates/class.h
+++ b/scripts/templates/class.h
@@ -355,7 +355,7 @@ public:
     [%- END -%]
     [%- END -%]
     [%- END %]
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 [%- friendClasses = [] -%]
 [%- FOREACH friendClass IN classes.values -%]
diff --git a/src/mof/mof.pri b/src/mof/mof.pri
index 305c7200..1f2dffe2 100644
--- a/src/mof/mof.pri
+++ b/src/mof/mof.pri
@@ -54,7 +54,7 @@ PUBLIC_HEADERS += \
     qpackageimport.h \
     qargument.h \
     qbehavioralfeature.h \
-    qtmofmetamodel.h \
+    qmofmetamodel.h \
     qxmiwriter.h \
     qxmireader.h
 
@@ -170,6 +170,6 @@ SOURCES += \
     qpackageimport.cpp \
     qargument.cpp \
     qbehavioralfeature.cpp \
-    qtmofmetamodel.cpp \
+    qmofmetamodel.cpp \
     qxmiwriter.cpp \
     qxmireader.cpp
diff --git a/src/mof/qargument.cpp b/src/mof/qargument.cpp
index 9dc630ac..b5fc9d7b 100644
--- a/src/mof/qargument.cpp
+++ b/src/mof/qargument.cpp
@@ -114,18 +114,6 @@ void QArgument::setValue(QMofObject *value)
     }
 }
 
-void QArgument::registerMetaTypes() const
-{
-    qRegisterMetaType<QMofObject *>("QMofObject *");
-    qRegisterMetaType<QSet<QMofObject *>>("QSet<QMofObject *>");
-    qRegisterMetaType<QList<QMofObject *>>("QList<QMofObject *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QArgument::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QArgument")][QString::fromLatin1("name")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qargument.h b/src/mof/qargument.h
index 894f15af..f1bb10d9 100644
--- a/src/mof/qargument.h
+++ b/src/mof/qargument.h
@@ -80,7 +80,7 @@ public:
     Q_INVOKABLE void setName(QString name);
     Q_INVOKABLE QMofObject *value() const;
     Q_INVOKABLE void setValue(QMofObject *value);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qassociation.cpp b/src/mof/qassociation.cpp
index 8d051235..635244d2 100644
--- a/src/mof/qassociation.cpp
+++ b/src/mof/qassociation.cpp
@@ -642,22 +642,6 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd)
     }
 }
 
-void QAssociation::registerMetaTypes() const
-{
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QAssociation::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qassociation.h b/src/mof/qassociation.h
index 859c2068..d9809127 100644
--- a/src/mof/qassociation.h
+++ b/src/mof/qassociation.h
@@ -170,7 +170,7 @@ public:
     Q_INVOKABLE QList<QProperty *> memberEnds() const;
     Q_INVOKABLE void addMemberEnd(QProperty *memberEnd);
     Q_INVOKABLE void removeMemberEnd(QProperty *memberEnd);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qbehavioralfeature.cpp b/src/mof/qbehavioralfeature.cpp
index 149c282f..f0807b20 100644
--- a/src/mof/qbehavioralfeature.cpp
+++ b/src/mof/qbehavioralfeature.cpp
@@ -420,26 +420,6 @@ bool QBehavioralFeature::isDistinguishableFrom(const QNamedElement *n, const QNa
     return bool(); // change here to your derived return
 }
 
-void QBehavioralFeature::registerMetaTypes() const
-{
-    qRegisterMetaType<QParameter *>("QParameter *");
-    qRegisterMetaType<QSet<QParameter *>>("QSet<QParameter *>");
-    qRegisterMetaType<QList<QParameter *>>("QList<QParameter *>");
-
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QBehavioralFeature::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("raisedExceptions")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qbehavioralfeature.h b/src/mof/qbehavioralfeature.h
index 0e5fd8ba..a7e32673 100644
--- a/src/mof/qbehavioralfeature.h
+++ b/src/mof/qbehavioralfeature.h
@@ -138,7 +138,7 @@ public:
 
     // Operations
     Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qclass.cpp b/src/mof/qclass.cpp
index 5e9ea115..b2c4602d 100644
--- a/src/mof/qclass.cpp
+++ b/src/mof/qclass.cpp
@@ -294,26 +294,6 @@ QSet<QNamedElement *> QClass::inherit(QSet<QNamedElement *> inhs) const
     return QSet<QNamedElement *>(); // change here to your derived return
 }
 
-void QClass::registerMetaTypes() const
-{
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    QClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QClass::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qclass.h b/src/mof/qclass.h
index 84036969..169a73b2 100644
--- a/src/mof/qclass.h
+++ b/src/mof/qclass.h
@@ -101,7 +101,7 @@ public:
 
     // Operations
     Q_INVOKABLE QSet<QNamedElement *> inherit(QSet<QNamedElement *> inhs) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qclassifier.cpp b/src/mof/qclassifier.cpp
index 30ef733d..f84f5030 100644
--- a/src/mof/qclassifier.cpp
+++ b/src/mof/qclassifier.cpp
@@ -693,30 +693,6 @@ QSet<QClassifier *> QClassifier::parents() const
     return QSet<QClassifier *>(); // change here to your derived return
 }
 
-void QClassifier::registerMetaTypes() const
-{
-    qRegisterMetaType<QGeneralization *>("QGeneralization *");
-    qRegisterMetaType<QSet<QGeneralization *>>("QSet<QGeneralization *>");
-    qRegisterMetaType<QList<QGeneralization *>>("QList<QGeneralization *>");
-
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QFeature *>("QFeature *");
-    qRegisterMetaType<QSet<QFeature *>>("QSet<QFeature *>");
-    qRegisterMetaType<QList<QFeature *>>("QList<QFeature *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QClassifier::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qclassifier.h b/src/mof/qclassifier.h
index 1f1fa6cb..3a6201c4 100644
--- a/src/mof/qclassifier.h
+++ b/src/mof/qclassifier.h
@@ -165,7 +165,7 @@ public:
     Q_INVOKABLE QSet<QNamedElement *> inheritableMembers(const QClassifier *c) const;
     Q_INVOKABLE bool maySpecializeType(const QClassifier *c) const;
     Q_INVOKABLE QSet<QClassifier *> parents() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/mof/qcomment.cpp b/src/mof/qcomment.cpp
index df12a331..e0f57928 100644
--- a/src/mof/qcomment.cpp
+++ b/src/mof/qcomment.cpp
@@ -138,14 +138,6 @@ void QComment::removeAnnotatedElement(QElement *annotatedElement)
     }
 }
 
-void QComment::registerMetaTypes() const
-{
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QComment::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qcomment.h b/src/mof/qcomment.h
index 93fd07a2..c386dfc3 100644
--- a/src/mof/qcomment.h
+++ b/src/mof/qcomment.h
@@ -80,7 +80,7 @@ public:
     Q_INVOKABLE QSet<QElement *> annotatedElements() const;
     Q_INVOKABLE void addAnnotatedElement(QElement *annotatedElement);
     Q_INVOKABLE void removeAnnotatedElement(QElement *annotatedElement);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qconstraint.cpp b/src/mof/qconstraint.cpp
index e1a34e2f..256d2703 100644
--- a/src/mof/qconstraint.cpp
+++ b/src/mof/qconstraint.cpp
@@ -180,26 +180,6 @@ void QConstraint::removeConstrainedElement(QElement *constrainedElement)
     }
 }
 
-void QConstraint::registerMetaTypes() const
-{
-    qRegisterMetaType<QElement *>("QElement *");
-    qRegisterMetaType<QSet<QElement *>>("QSet<QElement *>");
-    qRegisterMetaType<QList<QElement *>>("QList<QElement *>");
-
-    qRegisterMetaType<QNamespace *>("QNamespace *");
-    qRegisterMetaType<QSet<QNamespace *>>("QSet<QNamespace *>");
-    qRegisterMetaType<QList<QNamespace *>>("QList<QNamespace *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QPackageableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QConstraint::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qconstraint.h b/src/mof/qconstraint.h
index ece0a3f7..42ffdcf2 100644
--- a/src/mof/qconstraint.h
+++ b/src/mof/qconstraint.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE QList<QElement *> constrainedElements() const;
     Q_INVOKABLE void addConstrainedElement(QElement *constrainedElement);
     Q_INVOKABLE void removeConstrainedElement(QElement *constrainedElement);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qdatatype.cpp b/src/mof/qdatatype.cpp
index 6fbdf91d..17d36f6c 100644
--- a/src/mof/qdatatype.cpp
+++ b/src/mof/qdatatype.cpp
@@ -187,26 +187,6 @@ QSet<QNamedElement *> QDataType::inherit(QSet<QNamedElement *> inhs) const
     return QSet<QNamedElement *>(); // change here to your derived return
 }
 
-void QDataType::registerMetaTypes() const
-{
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    QClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDataType::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/mof/qdatatype.h b/src/mof/qdatatype.h
index 8565ebc5..10f85903 100644
--- a/src/mof/qdatatype.h
+++ b/src/mof/qdatatype.h
@@ -87,7 +87,7 @@ public:
 
     // Operations
     Q_INVOKABLE QSet<QNamedElement *> inherit(QSet<QNamedElement *> inhs) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qdirectedrelationship.cpp b/src/mof/qdirectedrelationship.cpp
index d3d53e7c..463f1138 100644
--- a/src/mof/qdirectedrelationship.cpp
+++ b/src/mof/qdirectedrelationship.cpp
@@ -154,18 +154,6 @@ QSet<QElement *> QDirectedRelationship::targets() const
     return d->targets;
 }
 
-void QDirectedRelationship::registerMetaTypes() const
-{
-    qRegisterMetaType<QElement *>("QElement *");
-    qRegisterMetaType<QSet<QElement *>>("QSet<QElement *>");
-    qRegisterMetaType<QList<QElement *>>("QList<QElement *>");
-
-    QRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDirectedRelationship::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qdirectedrelationship.h b/src/mof/qdirectedrelationship.h
index 56e7573c..241600e8 100644
--- a/src/mof/qdirectedrelationship.h
+++ b/src/mof/qdirectedrelationship.h
@@ -77,7 +77,7 @@ public:
     // Association ends from QDirectedRelationship
     Q_INVOKABLE QSet<QElement *> sources() const;
     Q_INVOKABLE QSet<QElement *> targets() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qelement.cpp b/src/mof/qelement.cpp
index 75c59544..cb763c62 100644
--- a/src/mof/qelement.cpp
+++ b/src/mof/qelement.cpp
@@ -236,22 +236,6 @@ void QElement::delete_()
     qWarning("QElement::delete_: operation to be implemented");
 }
 
-void QElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QComment *>("QComment *");
-    qRegisterMetaType<QSet<QComment *>>("QSet<QComment *>");
-    qRegisterMetaType<QList<QComment *>>("QList<QComment *>");
-
-    qRegisterMetaType<QClass *>("QClass *");
-    qRegisterMetaType<QSet<QClass *>>("QSet<QClass *>");
-    qRegisterMetaType<QList<QClass *>>("QList<QClass *>");
-
-    QMofObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/mof/qelement.h b/src/mof/qelement.h
index eda4a9ec..c9b23c67 100644
--- a/src/mof/qelement.h
+++ b/src/mof/qelement.h
@@ -90,7 +90,7 @@ public:
     Q_INVOKABLE QElement *container() const;
     Q_INVOKABLE bool isInstanceOfType(const QClass *type, bool includesSubtypes) const;
     Q_INVOKABLE void delete_();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qelementimport.cpp b/src/mof/qelementimport.cpp
index 8c1842c4..f96caf86 100644
--- a/src/mof/qelementimport.cpp
+++ b/src/mof/qelementimport.cpp
@@ -219,22 +219,6 @@ QString QElementImport::getName() const
     return QString(); // change here to your derived return
 }
 
-void QElementImport::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackageableElement *>("QPackageableElement *");
-    qRegisterMetaType<QSet<QPackageableElement *>>("QSet<QPackageableElement *>");
-    qRegisterMetaType<QList<QPackageableElement *>>("QList<QPackageableElement *>");
-
-    qRegisterMetaType<QNamespace *>("QNamespace *");
-    qRegisterMetaType<QSet<QNamespace *>>("QSet<QNamespace *>");
-    qRegisterMetaType<QList<QNamespace *>>("QList<QNamespace *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QElementImport::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qelementimport.h b/src/mof/qelementimport.h
index 0d8c801d..0e874d77 100644
--- a/src/mof/qelementimport.h
+++ b/src/mof/qelementimport.h
@@ -95,7 +95,7 @@ public:
 
     // Operations
     Q_INVOKABLE QString getName() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qenumeration.cpp b/src/mof/qenumeration.cpp
index 56d9d6fe..baa091f4 100644
--- a/src/mof/qenumeration.cpp
+++ b/src/mof/qenumeration.cpp
@@ -127,18 +127,6 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral)
     }
 }
 
-void QEnumeration::registerMetaTypes() const
-{
-    qRegisterMetaType<QEnumerationLiteral *>("QEnumerationLiteral *");
-    qRegisterMetaType<QSet<QEnumerationLiteral *>>("QSet<QEnumerationLiteral *>");
-    qRegisterMetaType<QList<QEnumerationLiteral *>>("QList<QEnumerationLiteral *>");
-
-    QDataType::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QEnumeration::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/mof/qenumeration.h b/src/mof/qenumeration.h
index 0f97a0de..0f8a2224 100644
--- a/src/mof/qenumeration.h
+++ b/src/mof/qenumeration.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE QList<QEnumerationLiteral *> ownedLiterals() const;
     Q_INVOKABLE void addOwnedLiteral(QEnumerationLiteral *ownedLiteral);
     Q_INVOKABLE void removeOwnedLiteral(QEnumerationLiteral *ownedLiteral);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qenumerationliteral.cpp b/src/mof/qenumerationliteral.cpp
index cd8661c8..9b2c18d4 100644
--- a/src/mof/qenumerationliteral.cpp
+++ b/src/mof/qenumerationliteral.cpp
@@ -129,18 +129,6 @@ void QEnumerationLiteral::setEnumeration(QEnumeration *enumeration)
     }
 }
 
-void QEnumerationLiteral::registerMetaTypes() const
-{
-    qRegisterMetaType<QEnumeration *>("QEnumeration *");
-    qRegisterMetaType<QSet<QEnumeration *>>("QSet<QEnumeration *>");
-    qRegisterMetaType<QList<QEnumeration *>>("QList<QEnumeration *>");
-
-    QInstanceSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QEnumerationLiteral::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qenumerationliteral.h b/src/mof/qenumerationliteral.h
index f9a314ec..4566e163 100644
--- a/src/mof/qenumerationliteral.h
+++ b/src/mof/qenumerationliteral.h
@@ -75,7 +75,7 @@ public:
     Q_INVOKABLE QEnumeration *classifier() const;
     Q_INVOKABLE QEnumeration *enumeration() const;
     Q_INVOKABLE void setEnumeration(QEnumeration *enumeration);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qexception.cpp b/src/mof/qexception.cpp
index dbdb2cf6..0b349c8f 100644
--- a/src/mof/qexception.cpp
+++ b/src/mof/qexception.cpp
@@ -133,18 +133,6 @@ void QException::setObjectInError(QElement *objectInError)
     }
 }
 
-void QException::registerMetaTypes() const
-{
-    qRegisterMetaType<QElement *>("QElement *");
-    qRegisterMetaType<QSet<QElement *>>("QSet<QElement *>");
-    qRegisterMetaType<QList<QElement *>>("QList<QElement *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QException::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QException")][QString::fromLatin1("description")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qexception.h b/src/mof/qexception.h
index 47ed10be..063afd8b 100644
--- a/src/mof/qexception.h
+++ b/src/mof/qexception.h
@@ -83,7 +83,7 @@ public:
     Q_INVOKABLE void setElementInError(QElement *elementInError);
     Q_INVOKABLE QElement *objectInError() const;
     Q_INVOKABLE void setObjectInError(QElement *objectInError);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qexpression.cpp b/src/mof/qexpression.cpp
index 475af446..1812e47a 100644
--- a/src/mof/qexpression.cpp
+++ b/src/mof/qexpression.cpp
@@ -144,14 +144,6 @@ void QExpression::removeOperand(QValueSpecification *operand)
     }
 }
 
-void QExpression::registerMetaTypes() const
-{
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExpression::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qexpression.h b/src/mof/qexpression.h
index 39f81df3..39a451c2 100644
--- a/src/mof/qexpression.h
+++ b/src/mof/qexpression.h
@@ -80,7 +80,7 @@ public:
     Q_INVOKABLE QList<QValueSpecification *> operands() const;
     Q_INVOKABLE void addOperand(QValueSpecification *operand);
     Q_INVOKABLE void removeOperand(QValueSpecification *operand);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qextent.cpp b/src/mof/qextent.cpp
index b846a0dc..ac5648a4 100644
--- a/src/mof/qextent.cpp
+++ b/src/mof/qextent.cpp
@@ -128,34 +128,6 @@ bool QExtent::linkExists(const QAssociation *association, const QElement *firstE
     return bool(); // change here to your derived return
 }
 
-void QExtent::registerMetaTypes() const
-{
-    qRegisterMetaType<QLink *>("QLink *");
-    qRegisterMetaType<QSet<QLink *>>("QSet<QLink *>");
-    qRegisterMetaType<QList<QLink *>>("QList<QLink *>");
-
-    qRegisterMetaType<QAssociation *>("QAssociation *");
-    qRegisterMetaType<QSet<QAssociation *>>("QSet<QAssociation *>");
-    qRegisterMetaType<QList<QAssociation *>>("QList<QAssociation *>");
-
-    qRegisterMetaType<QClass *>("QClass *");
-    qRegisterMetaType<QSet<QClass *>>("QSet<QClass *>");
-    qRegisterMetaType<QList<QClass *>>("QList<QClass *>");
-
-    qRegisterMetaType<QReflectiveSequence *>("QReflectiveSequence *");
-    qRegisterMetaType<QSet<QReflectiveSequence *>>("QSet<QReflectiveSequence *>");
-    qRegisterMetaType<QList<QReflectiveSequence *>>("QList<QReflectiveSequence *>");
-
-    qRegisterMetaType<QElement *>("QElement *");
-    qRegisterMetaType<QSet<QElement *>>("QSet<QElement *>");
-    qRegisterMetaType<QList<QElement *>>("QList<QElement *>");
-
-    QMofObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExtent::setPropertyData()
 {
     QMofObject::setPropertyData();
diff --git a/src/mof/qextent.h b/src/mof/qextent.h
index 087af133..facdd1cd 100644
--- a/src/mof/qextent.h
+++ b/src/mof/qextent.h
@@ -82,7 +82,7 @@ public:
     Q_INVOKABLE QSet<QLink *> linksOfType(const QAssociation *type) const;
     Q_INVOKABLE QSet<QElement *> linkedElements(const QAssociation *association, const QElement *endElement, bool end1ToEnd2Direction) const;
     Q_INVOKABLE bool linkExists(const QAssociation *association, const QElement *firstElement, const QElement *secondElement) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qfactory.cpp b/src/mof/qfactory.cpp
index cf46991e..8859898c 100644
--- a/src/mof/qfactory.cpp
+++ b/src/mof/qfactory.cpp
@@ -147,42 +147,6 @@ QLink *QFactory::createLink(const QAssociation *association, const QElement *fir
     return 0; // change here to your derived return
 }
 
-void QFactory::registerMetaTypes() const
-{
-    qRegisterMetaType<QLink *>("QLink *");
-    qRegisterMetaType<QSet<QLink *>>("QSet<QLink *>");
-    qRegisterMetaType<QList<QLink *>>("QList<QLink *>");
-
-    qRegisterMetaType<QArgument *>("QArgument *");
-    qRegisterMetaType<QSet<QArgument *>>("QSet<QArgument *>");
-    qRegisterMetaType<QList<QArgument *>>("QList<QArgument *>");
-
-    qRegisterMetaType<QAssociation *>("QAssociation *");
-    qRegisterMetaType<QSet<QAssociation *>>("QSet<QAssociation *>");
-    qRegisterMetaType<QList<QAssociation *>>("QList<QAssociation *>");
-
-    qRegisterMetaType<QClass *>("QClass *");
-    qRegisterMetaType<QSet<QClass *>>("QSet<QClass *>");
-    qRegisterMetaType<QList<QClass *>>("QList<QClass *>");
-
-    qRegisterMetaType<QMofObject *>("QMofObject *");
-    qRegisterMetaType<QSet<QMofObject *>>("QSet<QMofObject *>");
-    qRegisterMetaType<QList<QMofObject *>>("QList<QMofObject *>");
-
-    qRegisterMetaType<QPackage *>("QPackage *");
-    qRegisterMetaType<QSet<QPackage *>>("QSet<QPackage *>");
-    qRegisterMetaType<QList<QPackage *>>("QList<QPackage *>");
-
-    qRegisterMetaType<QDataType *>("QDataType *");
-    qRegisterMetaType<QSet<QDataType *>>("QSet<QDataType *>");
-    qRegisterMetaType<QList<QDataType *>>("QList<QDataType *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QFactory::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QFactory")][QString::fromLatin1("package")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qfactory.h b/src/mof/qfactory.h
index e99e9ff2..a818ab2e 100644
--- a/src/mof/qfactory.h
+++ b/src/mof/qfactory.h
@@ -90,7 +90,7 @@ public:
     Q_INVOKABLE QElement *create(const QClass *metaClass);
     Q_INVOKABLE QElement *createElement(const QClass *class_, QSet<QArgument *> arguments);
     Q_INVOKABLE QLink *createLink(const QAssociation *association, const QElement *firstElement, const QElement *secondElement);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qfeature.cpp b/src/mof/qfeature.cpp
index 43b222f6..93a37fd0 100644
--- a/src/mof/qfeature.cpp
+++ b/src/mof/qfeature.cpp
@@ -158,18 +158,6 @@ QSet<QClassifier *> QFeature::featuringClassifiers() const
     return d->featuringClassifiers;
 }
 
-void QFeature::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    QRedefinableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QFeature::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qfeature.h b/src/mof/qfeature.h
index 9d5f41e8..331ec8e4 100644
--- a/src/mof/qfeature.h
+++ b/src/mof/qfeature.h
@@ -81,7 +81,7 @@ public:
 
     // Association ends from QFeature
     Q_INVOKABLE QSet<QClassifier *> featuringClassifiers() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/mof/qgeneralization.cpp b/src/mof/qgeneralization.cpp
index c666efce..08279694 100644
--- a/src/mof/qgeneralization.cpp
+++ b/src/mof/qgeneralization.cpp
@@ -187,18 +187,6 @@ void QGeneralization::setGeneral(QClassifier *general)
     }
 }
 
-void QGeneralization::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QGeneralization::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qgeneralization.h b/src/mof/qgeneralization.h
index 3a217ba2..7dce1007 100644
--- a/src/mof/qgeneralization.h
+++ b/src/mof/qgeneralization.h
@@ -82,7 +82,7 @@ public:
     Q_INVOKABLE void setSpecific(QClassifier *specific);
     Q_INVOKABLE QClassifier *general() const;
     Q_INVOKABLE void setGeneral(QClassifier *general);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qinstancespecification.cpp b/src/mof/qinstancespecification.cpp
index 7ba2e17a..8d0575ff 100644
--- a/src/mof/qinstancespecification.cpp
+++ b/src/mof/qinstancespecification.cpp
@@ -190,26 +190,6 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_)
     }
 }
 
-void QInstanceSpecification::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QSlot *>("QSlot *");
-    qRegisterMetaType<QSet<QSlot *>>("QSet<QSlot *>");
-    qRegisterMetaType<QList<QSlot *>>("QList<QSlot *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QPackageableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInstanceSpecification::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qinstancespecification.h b/src/mof/qinstancespecification.h
index 13618bc9..eabb4c01 100644
--- a/src/mof/qinstancespecification.h
+++ b/src/mof/qinstancespecification.h
@@ -86,7 +86,7 @@ public:
     Q_INVOKABLE QSet<QSlot *> slots_() const;
     Q_INVOKABLE void addSlot_(QSlot *slot_);
     Q_INVOKABLE void removeSlot_(QSlot *slot_);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qinstancevalue.cpp b/src/mof/qinstancevalue.cpp
index 93515363..ee03d914 100644
--- a/src/mof/qinstancevalue.cpp
+++ b/src/mof/qinstancevalue.cpp
@@ -106,18 +106,6 @@ void QInstanceValue::setInstance(QInstanceSpecification *instance)
     }
 }
 
-void QInstanceValue::registerMetaTypes() const
-{
-    qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *");
-    qRegisterMetaType<QSet<QInstanceSpecification *>>("QSet<QInstanceSpecification *>");
-    qRegisterMetaType<QList<QInstanceSpecification *>>("QList<QInstanceSpecification *>");
-
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInstanceValue::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qinstancevalue.h b/src/mof/qinstancevalue.h
index cb90d3dd..460c8912 100644
--- a/src/mof/qinstancevalue.h
+++ b/src/mof/qinstancevalue.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QInstanceValue
     Q_INVOKABLE QInstanceSpecification *instance() const;
     Q_INVOKABLE void setInstance(QInstanceSpecification *instance);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qlink.cpp b/src/mof/qlink.cpp
index 2fc89e76..6fda38ed 100644
--- a/src/mof/qlink.cpp
+++ b/src/mof/qlink.cpp
@@ -148,22 +148,6 @@ void QLink::delete_()
     qWarning("QLink::delete_: operation to be implemented");
 }
 
-void QLink::registerMetaTypes() const
-{
-    qRegisterMetaType<QElement *>("QElement *");
-    qRegisterMetaType<QSet<QElement *>>("QSet<QElement *>");
-    qRegisterMetaType<QList<QElement *>>("QList<QElement *>");
-
-    qRegisterMetaType<QAssociation *>("QAssociation *");
-    qRegisterMetaType<QSet<QAssociation *>>("QSet<QAssociation *>");
-    qRegisterMetaType<QList<QAssociation *>>("QList<QAssociation *>");
-
-    QMofObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLink::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLink")][QString::fromLatin1("association")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qlink.h b/src/mof/qlink.h
index d0dd2e06..5e947d99 100644
--- a/src/mof/qlink.h
+++ b/src/mof/qlink.h
@@ -84,7 +84,7 @@ public:
     // Operations
     Q_INVOKABLE bool equals(const QLink *otherLink) const;
     Q_INVOKABLE void delete_();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qliteralboolean.cpp b/src/mof/qliteralboolean.cpp
index b239d5cf..32e0965a 100644
--- a/src/mof/qliteralboolean.cpp
+++ b/src/mof/qliteralboolean.cpp
@@ -132,14 +132,6 @@ bool QLiteralBoolean::isComputable() const
     return bool(); // change here to your derived return
 }
 
-void QLiteralBoolean::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralBoolean::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qliteralboolean.h b/src/mof/qliteralboolean.h
index cf9a690f..08baf93c 100644
--- a/src/mof/qliteralboolean.h
+++ b/src/mof/qliteralboolean.h
@@ -75,7 +75,7 @@ public:
     // Operations
     Q_INVOKABLE bool booleanValue() const;
     Q_INVOKABLE bool isComputable() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qliteralinteger.cpp b/src/mof/qliteralinteger.cpp
index 5a8eae47..aafeac13 100644
--- a/src/mof/qliteralinteger.cpp
+++ b/src/mof/qliteralinteger.cpp
@@ -123,14 +123,6 @@ bool QLiteralInteger::isComputable() const
     return bool(); // change here to your derived return
 }
 
-void QLiteralInteger::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralInteger::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qliteralinteger.h b/src/mof/qliteralinteger.h
index 2da2a150..91783cde 100644
--- a/src/mof/qliteralinteger.h
+++ b/src/mof/qliteralinteger.h
@@ -74,7 +74,7 @@ public:
     // Operations
     Q_INVOKABLE qint32 integerValue() const;
     Q_INVOKABLE bool isComputable() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qliteralnull.cpp b/src/mof/qliteralnull.cpp
index 854c4972..b5f98008 100644
--- a/src/mof/qliteralnull.cpp
+++ b/src/mof/qliteralnull.cpp
@@ -98,14 +98,6 @@ bool QLiteralNull::isNull() const
     return bool(); // change here to your derived return
 }
 
-void QLiteralNull::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralNull::setPropertyData()
 {
     QLiteralSpecification::setPropertyData();
diff --git a/src/mof/qliteralnull.h b/src/mof/qliteralnull.h
index a9778d62..628f9555 100644
--- a/src/mof/qliteralnull.h
+++ b/src/mof/qliteralnull.h
@@ -68,7 +68,7 @@ public:
     // Operations
     Q_INVOKABLE bool isComputable() const;
     Q_INVOKABLE bool isNull() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qliteralreal.cpp b/src/mof/qliteralreal.cpp
index c8668608..c746ed2f 100644
--- a/src/mof/qliteralreal.cpp
+++ b/src/mof/qliteralreal.cpp
@@ -120,14 +120,6 @@ qreal QLiteralReal::realValue() const
     return qreal(); // change here to your derived return
 }
 
-void QLiteralReal::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralReal::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qliteralreal.h b/src/mof/qliteralreal.h
index 8122ad06..d83302de 100644
--- a/src/mof/qliteralreal.h
+++ b/src/mof/qliteralreal.h
@@ -74,7 +74,7 @@ public:
     // Operations
     Q_INVOKABLE bool isComputable() const;
     Q_INVOKABLE qreal realValue() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qliteralspecification.cpp b/src/mof/qliteralspecification.cpp
index 53dc6d21..a2c48e53 100644
--- a/src/mof/qliteralspecification.cpp
+++ b/src/mof/qliteralspecification.cpp
@@ -78,14 +78,6 @@ QLiteralSpecification::~QLiteralSpecification()
 {
 }
 
-void QLiteralSpecification::registerMetaTypes() const
-{
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralSpecification::setPropertyData()
 {
     QValueSpecification::setPropertyData();
diff --git a/src/mof/qliteralspecification.h b/src/mof/qliteralspecification.h
index 1c2bec16..05e01b4b 100644
--- a/src/mof/qliteralspecification.h
+++ b/src/mof/qliteralspecification.h
@@ -64,7 +64,7 @@ class Q_MOF_EXPORT QLiteralSpecification : public QValueSpecification
 public:
     Q_INVOKABLE explicit QLiteralSpecification(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QLiteralSpecification();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qliteralstring.cpp b/src/mof/qliteralstring.cpp
index d42ab498..32dbfb89 100644
--- a/src/mof/qliteralstring.cpp
+++ b/src/mof/qliteralstring.cpp
@@ -123,14 +123,6 @@ QString QLiteralString::stringValue() const
     return QString(); // change here to your derived return
 }
 
-void QLiteralString::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralString::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qliteralstring.h b/src/mof/qliteralstring.h
index 3aeafb8b..71565371 100644
--- a/src/mof/qliteralstring.h
+++ b/src/mof/qliteralstring.h
@@ -77,7 +77,7 @@ public:
     // Operations
     Q_INVOKABLE bool isComputable() const;
     Q_INVOKABLE QString stringValue() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qliteralunlimitednatural.cpp b/src/mof/qliteralunlimitednatural.cpp
index 1f962ac6..47f40c26 100644
--- a/src/mof/qliteralunlimitednatural.cpp
+++ b/src/mof/qliteralunlimitednatural.cpp
@@ -132,14 +132,6 @@ qint32 QLiteralUnlimitedNatural::unlimitedValue() const
     return qint32(); // change here to your derived return
 }
 
-void QLiteralUnlimitedNatural::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralUnlimitedNatural::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qliteralunlimitednatural.h b/src/mof/qliteralunlimitednatural.h
index 75d95b0e..e539b60e 100644
--- a/src/mof/qliteralunlimitednatural.h
+++ b/src/mof/qliteralunlimitednatural.h
@@ -75,7 +75,7 @@ public:
     // Operations
     Q_INVOKABLE bool isComputable() const;
     Q_INVOKABLE qint32 unlimitedValue() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qtmofmetamodel.cpp b/src/mof/qmofmetamodel.cpp
index 44037e59..e535aed4 100644
--- a/src/mof/qtmofmetamodel.cpp
+++ b/src/mof/qmofmetamodel.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qtmofmetamodel.h"
+#include "qmofmetamodel.h"
 
 QT_BEGIN_NAMESPACE_QTMOF
 
-void QtMofMetaModel::init()
+void QMofMetaModel::init()
 {
     qRegisterMetaType<QArgument *>("QArgument *");
     qRegisterMetaType<QList<QArgument *>>("QList<QArgument *>");
diff --git a/src/mof/qtmofmetamodel.h b/src/mof/qmofmetamodel.h
index 59dd0978..d6186eaf 100644
--- a/src/mof/qtmofmetamodel.h
+++ b/src/mof/qmofmetamodel.h
@@ -38,8 +38,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef QTMOFMETAMODEL_H
-#define QTMOFMETAMODEL_H
+#ifndef QMOFMETAMODEL_H
+#define QMOFMETAMODEL_H
 
 #include <QtMof/QtMof>
 
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE_QTMOF
 
 QT_MODULE(QtMof)
 
-class Q_MOF_EXPORT QtMofMetaModel
+class Q_MOF_EXPORT QMofMetaModel
 {
 public:
     static void init();
@@ -59,5 +59,5 @@ QT_END_NAMESPACE_QTMOF
 
 QT_END_HEADER
 
-#endif // QTMOFMETAMODEL_H
+#endif // QMOFMETAMODEL_H
 
diff --git a/src/mof/qmofobject.cpp b/src/mof/qmofobject.cpp
index fece99b7..b70de5e5 100644
--- a/src/mof/qmofobject.cpp
+++ b/src/mof/qmofobject.cpp
@@ -121,26 +121,6 @@ QMofObject *QMofObject::invoke(const QOperation *op, QSet<QArgument *> arguments
     return 0; // change here to your derived return
 }
 
-void QMofObject::registerMetaTypes() const
-{
-    qRegisterMetaType<QArgument *>("QArgument *");
-    qRegisterMetaType<QSet<QArgument *>>("QSet<QArgument *>");
-    qRegisterMetaType<QList<QArgument *>>("QList<QArgument *>");
-
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QMofObject::setPropertyData()
 {
     QWrappedObject::setPropertyData();
diff --git a/src/mof/qmofobject.h b/src/mof/qmofobject.h
index d156f375..a54f90f3 100644
--- a/src/mof/qmofobject.h
+++ b/src/mof/qmofobject.h
@@ -81,7 +81,7 @@ public:
     Q_INVOKABLE bool isSet(const QProperty *property) const;
     Q_INVOKABLE void unset(const QProperty *property);
     Q_INVOKABLE QMofObject *invoke(const QOperation *op, QSet<QArgument *> arguments);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qmultiplicityelement.cpp b/src/mof/qmultiplicityelement.cpp
index e1639673..98bafd36 100644
--- a/src/mof/qmultiplicityelement.cpp
+++ b/src/mof/qmultiplicityelement.cpp
@@ -315,18 +315,6 @@ qint32 QMultiplicityElement::upperBound() const
     return qint32(); // change here to your derived return
 }
 
-void QMultiplicityElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QMultiplicityElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qmultiplicityelement.h b/src/mof/qmultiplicityelement.h
index 0be4bc1c..75d8a446 100644
--- a/src/mof/qmultiplicityelement.h
+++ b/src/mof/qmultiplicityelement.h
@@ -100,7 +100,7 @@ public:
     Q_INVOKABLE bool isMultivalued() const;
     Q_INVOKABLE qint32 lowerBound() const;
     Q_INVOKABLE qint32 upperBound() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qnamedelement.cpp b/src/mof/qnamedelement.cpp
index 9c69242d..e3843967 100644
--- a/src/mof/qnamedelement.cpp
+++ b/src/mof/qnamedelement.cpp
@@ -229,18 +229,6 @@ QString QNamedElement::separator() const
     return QStringLiteral("::");
 }
 
-void QNamedElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QNamespace *>("QNamespace *");
-    qRegisterMetaType<QSet<QNamespace *>>("QSet<QNamespace *>");
-    qRegisterMetaType<QList<QNamespace *>>("QList<QNamespace *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QNamedElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qnamedelement.h b/src/mof/qnamedelement.h
index 9aeb7d02..2cb557c9 100644
--- a/src/mof/qnamedelement.h
+++ b/src/mof/qnamedelement.h
@@ -94,7 +94,7 @@ public:
     Q_INVOKABLE QList<QNamespace *> allNamespaces() const;
     Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const;
     Q_INVOKABLE QString separator() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/mof/qnamespace.cpp b/src/mof/qnamespace.cpp
index bc29d83c..f415925f 100644
--- a/src/mof/qnamespace.cpp
+++ b/src/mof/qnamespace.cpp
@@ -373,30 +373,6 @@ bool QNamespace::membersAreDistinguishable() const
     return bool(); // change here to your derived return
 }
 
-void QNamespace::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackageImport *>("QPackageImport *");
-    qRegisterMetaType<QSet<QPackageImport *>>("QSet<QPackageImport *>");
-    qRegisterMetaType<QList<QPackageImport *>>("QList<QPackageImport *>");
-
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QElementImport *>("QElementImport *");
-    qRegisterMetaType<QSet<QElementImport *>>("QSet<QElementImport *>");
-    qRegisterMetaType<QList<QElementImport *>>("QList<QElementImport *>");
-
-    qRegisterMetaType<QPackageableElement *>("QPackageableElement *");
-    qRegisterMetaType<QSet<QPackageableElement *>>("QSet<QPackageableElement *>");
-    qRegisterMetaType<QList<QPackageableElement *>>("QList<QPackageableElement *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QNamespace::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/mof/qnamespace.h b/src/mof/qnamespace.h
index 0de642aa..779aa76f 100644
--- a/src/mof/qnamespace.h
+++ b/src/mof/qnamespace.h
@@ -101,7 +101,7 @@ public:
     Q_INVOKABLE QSet<QString> getNamesOfMember(const QNamedElement *element) const;
     Q_INVOKABLE QSet<QPackageableElement *> importMembers(const QPackageableElement *imps) const;
     Q_INVOKABLE bool membersAreDistinguishable() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/mof/qopaqueexpression.cpp b/src/mof/qopaqueexpression.cpp
index 528e529d..3551d863 100644
--- a/src/mof/qopaqueexpression.cpp
+++ b/src/mof/qopaqueexpression.cpp
@@ -184,14 +184,6 @@ qint32 QOpaqueExpression::value() const
     return qint32(); // change here to your derived return
 }
 
-void QOpaqueExpression::registerMetaTypes() const
-{
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QOpaqueExpression::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qopaqueexpression.h b/src/mof/qopaqueexpression.h
index 39c0f182..aa8b6000 100644
--- a/src/mof/qopaqueexpression.h
+++ b/src/mof/qopaqueexpression.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE bool isNonNegative() const;
     Q_INVOKABLE bool isPositive() const;
     Q_INVOKABLE qint32 value() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qoperation.cpp b/src/mof/qoperation.cpp
index 184f7d7d..f84abeba 100644
--- a/src/mof/qoperation.cpp
+++ b/src/mof/qoperation.cpp
@@ -501,38 +501,6 @@ QSet<QParameter *> QOperation::returnResult() const
     return QSet<QParameter *>(); // change here to your derived return
 }
 
-void QOperation::registerMetaTypes() const
-{
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *");
-    qRegisterMetaType<QSet<QRedefinableElement *>>("QSet<QRedefinableElement *>");
-    qRegisterMetaType<QList<QRedefinableElement *>>("QList<QRedefinableElement *>");
-
-    qRegisterMetaType<QParameter *>("QParameter *");
-    qRegisterMetaType<QSet<QParameter *>>("QSet<QParameter *>");
-    qRegisterMetaType<QList<QParameter *>>("QList<QParameter *>");
-
-    qRegisterMetaType<QClass *>("QClass *");
-    qRegisterMetaType<QSet<QClass *>>("QSet<QClass *>");
-    qRegisterMetaType<QList<QClass *>>("QList<QClass *>");
-
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QDataType *>("QDataType *");
-    qRegisterMetaType<QSet<QDataType *>>("QSet<QDataType *>");
-    qRegisterMetaType<QList<QDataType *>>("QList<QDataType *>");
-
-    QBehavioralFeature::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QOperation::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qoperation.h b/src/mof/qoperation.h
index ee6cf89e..f54ea915 100644
--- a/src/mof/qoperation.h
+++ b/src/mof/qoperation.h
@@ -128,7 +128,7 @@ public:
     // Operations
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
     Q_INVOKABLE QSet<QParameter *> returnResult() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qpackage.cpp b/src/mof/qpackage.cpp
index 2b91d678..9f55af51 100644
--- a/src/mof/qpackage.cpp
+++ b/src/mof/qpackage.cpp
@@ -526,26 +526,6 @@ QSet<QPackageableElement *> QPackage::visibleMembers() const
     return QSet<QPackageableElement *>(); // change here to your derived return
 }
 
-void QPackage::registerMetaTypes() const
-{
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    qRegisterMetaType<QPackageMerge *>("QPackageMerge *");
-    qRegisterMetaType<QSet<QPackageMerge *>>("QSet<QPackageMerge *>");
-    qRegisterMetaType<QList<QPackageMerge *>>("QList<QPackageMerge *>");
-
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPackage::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qpackage.h b/src/mof/qpackage.h
index f32dbee3..ab1e8e34 100644
--- a/src/mof/qpackage.h
+++ b/src/mof/qpackage.h
@@ -151,7 +151,7 @@ public:
     Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QType> ownedType);
     Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QPackage> nestedPackage);
     Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QPackage> nestedPackage);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qpackageableelement.cpp b/src/mof/qpackageableelement.cpp
index 643bfd91..acfc4cb8 100644
--- a/src/mof/qpackageableelement.cpp
+++ b/src/mof/qpackageableelement.cpp
@@ -112,14 +112,6 @@ void QPackageableElement::unsetVisibility()
     d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility"));
 }
 
-void QPackageableElement::registerMetaTypes() const
-{
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPackageableElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qpackageableelement.h b/src/mof/qpackageableelement.h
index 78e3d1bc..277a6bc2 100644
--- a/src/mof/qpackageableelement.h
+++ b/src/mof/qpackageableelement.h
@@ -74,7 +74,7 @@ public:
     Q_INVOKABLE QtMof::VisibilityKind visibility() const;
     Q_INVOKABLE void setVisibility(QtMof::VisibilityKind visibility);
     Q_INVOKABLE void unsetVisibility();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qpackageimport.cpp b/src/mof/qpackageimport.cpp
index 8e233734..b81d72dd 100644
--- a/src/mof/qpackageimport.cpp
+++ b/src/mof/qpackageimport.cpp
@@ -188,22 +188,6 @@ void QPackageImport::setImportedPackage(QPackage *importedPackage)
     }
 }
 
-void QPackageImport::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackage *>("QPackage *");
-    qRegisterMetaType<QSet<QPackage *>>("QSet<QPackage *>");
-    qRegisterMetaType<QList<QPackage *>>("QList<QPackage *>");
-
-    qRegisterMetaType<QNamespace *>("QNamespace *");
-    qRegisterMetaType<QSet<QNamespace *>>("QSet<QNamespace *>");
-    qRegisterMetaType<QList<QNamespace *>>("QList<QNamespace *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPackageImport::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qpackageimport.h b/src/mof/qpackageimport.h
index dce8a0ce..79089223 100644
--- a/src/mof/qpackageimport.h
+++ b/src/mof/qpackageimport.h
@@ -86,7 +86,7 @@ public:
     Q_INVOKABLE void setImportingNamespace(QNamespace *importingNamespace);
     Q_INVOKABLE QPackage *importedPackage() const;
     Q_INVOKABLE void setImportedPackage(QPackage *importedPackage);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qpackagemerge.cpp b/src/mof/qpackagemerge.cpp
index fa179881..d8a36abb 100644
--- a/src/mof/qpackagemerge.cpp
+++ b/src/mof/qpackagemerge.cpp
@@ -153,18 +153,6 @@ void QPackageMerge::setReceivingPackage(QPackage *receivingPackage)
     }
 }
 
-void QPackageMerge::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackage *>("QPackage *");
-    qRegisterMetaType<QSet<QPackage *>>("QSet<QPackage *>");
-    qRegisterMetaType<QList<QPackage *>>("QList<QPackage *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPackageMerge::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qpackagemerge.h b/src/mof/qpackagemerge.h
index b03bc733..8eba62b0 100644
--- a/src/mof/qpackagemerge.h
+++ b/src/mof/qpackagemerge.h
@@ -76,7 +76,7 @@ public:
     Q_INVOKABLE void setMergedPackage(QPackage *mergedPackage);
     Q_INVOKABLE QPackage *receivingPackage() const;
     Q_INVOKABLE void setReceivingPackage(QPackage *receivingPackage);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qparameter.cpp b/src/mof/qparameter.cpp
index dff874d8..01d607c0 100644
--- a/src/mof/qparameter.cpp
+++ b/src/mof/qparameter.cpp
@@ -410,22 +410,6 @@ void QParameter::setDefaultValue(QValueSpecification *defaultValue)
     }
 }
 
-void QParameter::registerMetaTypes() const
-{
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QParameter::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("default_")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qparameter.h b/src/mof/qparameter.h
index acd4d572..c424a42a 100644
--- a/src/mof/qparameter.h
+++ b/src/mof/qparameter.h
@@ -134,7 +134,7 @@ public:
     Q_INVOKABLE void setOperation(QOperation *operation);
     Q_INVOKABLE QValueSpecification *defaultValue() const;
     Q_INVOKABLE void setDefaultValue(QValueSpecification *defaultValue);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qprimitivetype.cpp b/src/mof/qprimitivetype.cpp
index 40c4d2d6..a55aab3a 100644
--- a/src/mof/qprimitivetype.cpp
+++ b/src/mof/qprimitivetype.cpp
@@ -78,14 +78,6 @@ QPrimitiveType::~QPrimitiveType()
 {
 }
 
-void QPrimitiveType::registerMetaTypes() const
-{
-    QDataType::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPrimitiveType::setPropertyData()
 {
     QDataType::setPropertyData();
diff --git a/src/mof/qprimitivetype.h b/src/mof/qprimitivetype.h
index 30ea5f26..402667d1 100644
--- a/src/mof/qprimitivetype.h
+++ b/src/mof/qprimitivetype.h
@@ -64,7 +64,7 @@ class Q_MOF_EXPORT QPrimitiveType : public QDataType
 public:
     Q_INVOKABLE explicit QPrimitiveType(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QPrimitiveType();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qproperty.cpp b/src/mof/qproperty.cpp
index 9487f197..17806a1a 100644
--- a/src/mof/qproperty.cpp
+++ b/src/mof/qproperty.cpp
@@ -615,38 +615,6 @@ QSet<QType *> QProperty::subsettingContext() const
     return QSet<QType *>(); // change here to your derived return
 }
 
-void QProperty::registerMetaTypes() const
-{
-    qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *");
-    qRegisterMetaType<QSet<QRedefinableElement *>>("QSet<QRedefinableElement *>");
-    qRegisterMetaType<QList<QRedefinableElement *>>("QList<QRedefinableElement *>");
-
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    qRegisterMetaType<QClass *>("QClass *");
-    qRegisterMetaType<QSet<QClass *>>("QSet<QClass *>");
-    qRegisterMetaType<QList<QClass *>>("QList<QClass *>");
-
-    qRegisterMetaType<QAssociation *>("QAssociation *");
-    qRegisterMetaType<QSet<QAssociation *>>("QSet<QAssociation *>");
-    qRegisterMetaType<QList<QAssociation *>>("QList<QAssociation *>");
-
-    qRegisterMetaType<QDataType *>("QDataType *");
-    qRegisterMetaType<QSet<QDataType *>>("QSet<QDataType *>");
-    qRegisterMetaType<QList<QDataType *>>("QList<QDataType *>");
-
-    QStructuralFeature::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QProperty::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qproperty.h b/src/mof/qproperty.h
index a8e41d16..4da7c41f 100644
--- a/src/mof/qproperty.h
+++ b/src/mof/qproperty.h
@@ -142,7 +142,7 @@ public:
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
     Q_INVOKABLE bool isNavigable() const;
     Q_INVOKABLE QSet<QType *> subsettingContext() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qredefinableelement.cpp b/src/mof/qredefinableelement.cpp
index 6c2e75b8..84b56657 100644
--- a/src/mof/qredefinableelement.cpp
+++ b/src/mof/qredefinableelement.cpp
@@ -198,18 +198,6 @@ bool QRedefinableElement::isRedefinitionContextValid(const QRedefinableElement *
     return bool(); // change here to your derived return
 }
 
-void QRedefinableElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QRedefinableElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qredefinableelement.h b/src/mof/qredefinableelement.h
index aca41fff..258ed5a4 100644
--- a/src/mof/qredefinableelement.h
+++ b/src/mof/qredefinableelement.h
@@ -87,7 +87,7 @@ public:
     // Operations
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
     Q_INVOKABLE bool isRedefinitionContextValid(const QRedefinableElement *redefined) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qreflectivecollection.cpp b/src/mof/qreflectivecollection.cpp
index 1993b81d..92197667 100644
--- a/src/mof/qreflectivecollection.cpp
+++ b/src/mof/qreflectivecollection.cpp
@@ -107,14 +107,6 @@ qint32 QReflectiveCollection::size() const
     return qint32(); // change here to your derived return
 }
 
-void QReflectiveCollection::registerMetaTypes() const
-{
-    QMofObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReflectiveCollection::setPropertyData()
 {
     QMofObject::setPropertyData();
diff --git a/src/mof/qreflectivecollection.h b/src/mof/qreflectivecollection.h
index 80a31b9a..6f059ce8 100644
--- a/src/mof/qreflectivecollection.h
+++ b/src/mof/qreflectivecollection.h
@@ -71,7 +71,7 @@ public:
     Q_INVOKABLE void clear();
     Q_INVOKABLE bool remove(const QMofObject *object);
     Q_INVOKABLE qint32 size() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qreflectivesequence.cpp b/src/mof/qreflectivesequence.cpp
index 7cb06091..211634ed 100644
--- a/src/mof/qreflectivesequence.cpp
+++ b/src/mof/qreflectivesequence.cpp
@@ -105,18 +105,6 @@ QMofObject *QReflectiveSequence::set(qint32 index, const QMofObject *object)
     return 0; // change here to your derived return
 }
 
-void QReflectiveSequence::registerMetaTypes() const
-{
-    qRegisterMetaType<QMofObject *>("QMofObject *");
-    qRegisterMetaType<QSet<QMofObject *>>("QSet<QMofObject *>");
-    qRegisterMetaType<QList<QMofObject *>>("QList<QMofObject *>");
-
-    QReflectiveCollection::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReflectiveSequence::setPropertyData()
 {
     QReflectiveCollection::setPropertyData();
diff --git a/src/mof/qreflectivesequence.h b/src/mof/qreflectivesequence.h
index 1efd6fe7..4ec2ac0a 100644
--- a/src/mof/qreflectivesequence.h
+++ b/src/mof/qreflectivesequence.h
@@ -73,7 +73,7 @@ public:
     Q_INVOKABLE QMofObject *get(qint32 index) const;
     Q_INVOKABLE QMofObject *remove(qint32 index);
     Q_INVOKABLE QMofObject *set(qint32 index, const QMofObject *object);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qrelationship.cpp b/src/mof/qrelationship.cpp
index 820e86cb..81697855 100644
--- a/src/mof/qrelationship.cpp
+++ b/src/mof/qrelationship.cpp
@@ -111,14 +111,6 @@ QSet<QElement *> QRelationship::relatedElements() const
     return d->relatedElements;
 }
 
-void QRelationship::registerMetaTypes() const
-{
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QRelationship::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qrelationship.h b/src/mof/qrelationship.h
index 849acaab..66ab814f 100644
--- a/src/mof/qrelationship.h
+++ b/src/mof/qrelationship.h
@@ -72,7 +72,7 @@ public:
 
     // Association ends from QRelationship
     Q_INVOKABLE QSet<QElement *> relatedElements() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qslot.cpp b/src/mof/qslot.cpp
index 4ef1f73d..46a0c019 100644
--- a/src/mof/qslot.cpp
+++ b/src/mof/qslot.cpp
@@ -178,26 +178,6 @@ void QSlot::setOwningInstance(QInstanceSpecification *owningInstance)
     }
 }
 
-void QSlot::registerMetaTypes() const
-{
-    qRegisterMetaType<QStructuralFeature *>("QStructuralFeature *");
-    qRegisterMetaType<QSet<QStructuralFeature *>>("QSet<QStructuralFeature *>");
-    qRegisterMetaType<QList<QStructuralFeature *>>("QList<QStructuralFeature *>");
-
-    qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *");
-    qRegisterMetaType<QSet<QInstanceSpecification *>>("QSet<QInstanceSpecification *>");
-    qRegisterMetaType<QList<QInstanceSpecification *>>("QList<QInstanceSpecification *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QSlot::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/mof/qslot.h b/src/mof/qslot.h
index bb79c91b..c52540cd 100644
--- a/src/mof/qslot.h
+++ b/src/mof/qslot.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE void setDefiningFeature(QStructuralFeature *definingFeature);
     Q_INVOKABLE QInstanceSpecification *owningInstance() const;
     Q_INVOKABLE void setOwningInstance(QInstanceSpecification *owningInstance);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qstructuralfeature.cpp b/src/mof/qstructuralfeature.cpp
index ce2c13a5..563541ee 100644
--- a/src/mof/qstructuralfeature.cpp
+++ b/src/mof/qstructuralfeature.cpp
@@ -410,14 +410,6 @@ void QStructuralFeature::unsetReadOnly()
     d->modifiedResettableProperties.removeAll(QString::fromLatin1("isReadOnly"));
 }
 
-void QStructuralFeature::registerMetaTypes() const
-{
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStructuralFeature::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qstructuralfeature.h b/src/mof/qstructuralfeature.h
index f84d0076..d50a033d 100644
--- a/src/mof/qstructuralfeature.h
+++ b/src/mof/qstructuralfeature.h
@@ -132,7 +132,7 @@ public:
     Q_INVOKABLE bool isReadOnly() const;
     Q_INVOKABLE void setReadOnly(bool isReadOnly);
     Q_INVOKABLE void unsetReadOnly();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qtag.cpp b/src/mof/qtag.cpp
index 9bc832e1..552daf8e 100644
--- a/src/mof/qtag.cpp
+++ b/src/mof/qtag.cpp
@@ -158,14 +158,6 @@ void QTag::setTagOwner(QElement *tagOwner)
     }
 }
 
-void QTag::registerMetaTypes() const
-{
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTag::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTag")][QString::fromLatin1("elements")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qtag.h b/src/mof/qtag.h
index 44fa262a..7660d0ad 100644
--- a/src/mof/qtag.h
+++ b/src/mof/qtag.h
@@ -84,7 +84,7 @@ public:
     Q_INVOKABLE void setName(QString name);
     Q_INVOKABLE QElement *tagOwner() const;
     Q_INVOKABLE void setTagOwner(QElement *tagOwner);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qtype.cpp b/src/mof/qtype.cpp
index 27134ab2..2a69a3d9 100644
--- a/src/mof/qtype.cpp
+++ b/src/mof/qtype.cpp
@@ -137,22 +137,6 @@ bool QType::isInstance(const QMofObject *object) const
     return bool(); // change here to your derived return
 }
 
-void QType::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackage *>("QPackage *");
-    qRegisterMetaType<QSet<QPackage *>>("QSet<QPackage *>");
-    qRegisterMetaType<QList<QPackage *>>("QList<QPackage *>");
-
-    qRegisterMetaType<QMofObject *>("QMofObject *");
-    qRegisterMetaType<QSet<QMofObject *>>("QSet<QMofObject *>");
-    qRegisterMetaType<QList<QMofObject *>>("QList<QMofObject *>");
-
-    QPackageableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QType::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qtype.h b/src/mof/qtype.h
index 5c0f9eda..74d10688 100644
--- a/src/mof/qtype.h
+++ b/src/mof/qtype.h
@@ -78,7 +78,7 @@ public:
     // Operations
     Q_INVOKABLE bool conformsTo(const QType *other) const;
     Q_INVOKABLE bool isInstance(const QMofObject *object) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qtypedelement.cpp b/src/mof/qtypedelement.cpp
index e9c23192..b5a767f2 100644
--- a/src/mof/qtypedelement.cpp
+++ b/src/mof/qtypedelement.cpp
@@ -106,18 +106,6 @@ void QTypedElement::setType(QType *type)
     }
 }
 
-void QTypedElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTypedElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/mof/qtypedelement.h b/src/mof/qtypedelement.h
index 0854bf05..1e430df9 100644
--- a/src/mof/qtypedelement.h
+++ b/src/mof/qtypedelement.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QTypedElement
     Q_INVOKABLE QType *type() const;
     Q_INVOKABLE void setType(QType *type);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/quriextent.cpp b/src/mof/quriextent.cpp
index c81dd348..e22aa54f 100644
--- a/src/mof/quriextent.cpp
+++ b/src/mof/quriextent.cpp
@@ -96,18 +96,6 @@ QElement *QURIExtent::element(QString uri) const
     return 0; // change here to your derived return
 }
 
-void QURIExtent::registerMetaTypes() const
-{
-    qRegisterMetaType<QElement *>("QElement *");
-    qRegisterMetaType<QSet<QElement *>>("QSet<QElement *>");
-    qRegisterMetaType<QList<QElement *>>("QList<QElement *>");
-
-    QExtent::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QURIExtent::setPropertyData()
 {
     QExtent::setPropertyData();
diff --git a/src/mof/quriextent.h b/src/mof/quriextent.h
index f6bf154e..3f91bcf3 100644
--- a/src/mof/quriextent.h
+++ b/src/mof/quriextent.h
@@ -75,7 +75,7 @@ public:
     Q_INVOKABLE QString contextURI() const;
     Q_INVOKABLE QString uri(const QElement *object) const;
     Q_INVOKABLE QElement *element(QString uri) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qvaluespecification.cpp b/src/mof/qvaluespecification.cpp
index a50a12f9..d36211c8 100644
--- a/src/mof/qvaluespecification.cpp
+++ b/src/mof/qvaluespecification.cpp
@@ -268,14 +268,6 @@ qint32 QValueSpecification::unlimitedValue() const
     return qint32(); // change here to your derived return
 }
 
-void QValueSpecification::registerMetaTypes() const
-{
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QValueSpecification::setPropertyData()
 {
     QWrappedObject::setPropertyData();
diff --git a/src/mof/qvaluespecification.h b/src/mof/qvaluespecification.h
index 496d6c61..2a0d9f06 100644
--- a/src/mof/qvaluespecification.h
+++ b/src/mof/qvaluespecification.h
@@ -103,7 +103,7 @@ public:
     Q_INVOKABLE qreal realValue();
     Q_INVOKABLE QString stringValue() const;
     Q_INVOKABLE qint32 unlimitedValue() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/mof/qxmireader.cpp b/src/mof/qxmireader.cpp
index 9a696259..27bd9801 100644
--- a/src/mof/qxmireader.cpp
+++ b/src/mof/qxmireader.cpp
@@ -51,11 +51,11 @@
 #include <QtWrappedObjects/QMetaPropertyInfo>
 #include <QtWrappedObjects/QtWrappedObjectsNamespace>
 
+#include <QtMof/QMofMetaModel>
+
 using QtWrappedObjects::QMetaWrappedObject;
 using QtWrappedObjects::QMetaPropertyInfo;
 
-#include <QtMof>
-
 QT_BEGIN_NAMESPACE_QTMOF
 
 QXmiReaderPrivate::QXmiReaderPrivate()
@@ -69,6 +69,7 @@ QXmiReaderPrivate::~QXmiReaderPrivate()
 QXmiReader::QXmiReader(QObject *parent) :
     QObject(*new QXmiReaderPrivate, parent)
 {
+    QMofMetaModel::init();
 }
 
 QXmiReader::~QXmiReader()
diff --git a/src/mof/qxmiwriter.cpp b/src/mof/qxmiwriter.cpp
index 7c2ae592..d98ac497 100644
--- a/src/mof/qxmiwriter.cpp
+++ b/src/mof/qxmiwriter.cpp
@@ -49,6 +49,9 @@
 #include <QtWrappedObjects/QMetaWrappedObject>
 #include <QtWrappedObjects/QMetaPropertyInfo>
 #include <QtWrappedObjects/QtWrappedObjectsNamespace>
+
+#include <QtMof/QMofMetaModel>
+
 using QtWrappedObjects::QMetaWrappedObject;
 using QtWrappedObjects::QMetaPropertyInfo;
 
@@ -68,6 +71,7 @@ QXmiWriterPrivate::~QXmiWriterPrivate()
 QXmiWriter::QXmiWriter(QWrappedObject *wrappedObject, QObject *parent) :
     QObject(*new QXmiWriterPrivate(wrappedObject), parent)
 {
+    QMofMetaModel::init();
 }
 
 QXmiWriter::~QXmiWriter()
@@ -108,8 +112,6 @@ void QXmiWriter::populateIdMap(QWrappedObject *wrappedObject, int index)
                       QString::fromLatin1((index != -1) ? ".%1":"").arg(index);
     d->idMap.insert(wrappedObject, d->idStack.join(QString::fromLatin1("-")));
 
-    wrappedObject->registerMetaTypes();
-
     const QMetaWrappedObject *metaWrappedObject = wrappedObject->metaWrappedObject();
     int propertyCount = metaWrappedObject->propertyCount();
 
@@ -163,7 +165,6 @@ void QXmiWriter::writeWrappedObject(QWrappedObject *wrappedObject, QString eleme
         return;
 
     d->visitedObjects.append(wrappedObject);
-    wrappedObject->registerMetaTypes();
 
     d->writer.writeStartElement(elementName.isEmpty() ? QString::fromLatin1(d->wrappedObject->metaObject()->className()).remove(QRegularExpression(QString::fromLatin1("^Q"))).prepend(QString::fromLatin1("uml:"))
                                                       :
diff --git a/src/uml/qabstraction.cpp b/src/uml/qabstraction.cpp
index 0a59a17f..ca1788f6 100644
--- a/src/uml/qabstraction.cpp
+++ b/src/uml/qabstraction.cpp
@@ -114,18 +114,6 @@ void QAbstraction::setMapping(QOpaqueExpression *mapping)
     }
 }
 
-void QAbstraction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOpaqueExpression *>("QOpaqueExpression *");
-    qRegisterMetaType<QSet<QOpaqueExpression *>>("QSet<QOpaqueExpression *>");
-    qRegisterMetaType<QList<QOpaqueExpression *>>("QList<QOpaqueExpression *>");
-
-    QDependency::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QAbstraction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QAbstraction")][QString::fromLatin1("mapping")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qabstraction.h b/src/uml/qabstraction.h
index 8509daaf..61a2a893 100644
--- a/src/uml/qabstraction.h
+++ b/src/uml/qabstraction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QAbstraction
     Q_INVOKABLE QOpaqueExpression *mapping() const;
     Q_INVOKABLE void setMapping(QOpaqueExpression *mapping);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qacceptcallaction.cpp b/src/uml/qacceptcallaction.cpp
index 81667b30..14199bc6 100644
--- a/src/uml/qacceptcallaction.cpp
+++ b/src/uml/qacceptcallaction.cpp
@@ -114,18 +114,6 @@ void QAcceptCallAction::setReturnInformation(QOutputPin *returnInformation)
     }
 }
 
-void QAcceptCallAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QAcceptEventAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QAcceptCallAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptCallAction")][QString::fromLatin1("returnInformation")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qacceptcallaction.h b/src/uml/qacceptcallaction.h
index 53de5c6b..1da06e3e 100644
--- a/src/uml/qacceptcallaction.h
+++ b/src/uml/qacceptcallaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QAcceptCallAction
     Q_INVOKABLE QOutputPin *returnInformation() const;
     Q_INVOKABLE void setReturnInformation(QOutputPin *returnInformation);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qaccepteventaction.cpp b/src/uml/qaccepteventaction.cpp
index f4543007..1dbd907b 100644
--- a/src/uml/qaccepteventaction.cpp
+++ b/src/uml/qaccepteventaction.cpp
@@ -193,22 +193,6 @@ void QAcceptEventAction::removeResult(QOutputPin *result)
     }
 }
 
-void QAcceptEventAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    qRegisterMetaType<QTrigger *>("QTrigger *");
-    qRegisterMetaType<QSet<QTrigger *>>("QSet<QTrigger *>");
-    qRegisterMetaType<QList<QTrigger *>>("QList<QTrigger *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QAcceptEventAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QAcceptEventAction")][QString::fromLatin1("isUnmarshall")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qaccepteventaction.h b/src/uml/qaccepteventaction.h
index 56872093..3ce7e4d2 100644
--- a/src/uml/qaccepteventaction.h
+++ b/src/uml/qaccepteventaction.h
@@ -88,7 +88,7 @@ public:
     Q_INVOKABLE QSet<QOutputPin *> results() const;
     Q_INVOKABLE void addResult(QOutputPin *result);
     Q_INVOKABLE void removeResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qaction.cpp b/src/uml/qaction.cpp
index a10e9773..f51b78d1 100644
--- a/src/uml/qaction.cpp
+++ b/src/uml/qaction.cpp
@@ -277,30 +277,6 @@ QList<QOutputPin *> QAction::outputs() const
     return d->outputs;
 }
 
-void QAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QExecutableNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QAction")][QString::fromLatin1("isLocallyReentrant")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qaction.h b/src/uml/qaction.h
index 7eff2b0d..8b9113d7 100644
--- a/src/uml/qaction.h
+++ b/src/uml/qaction.h
@@ -97,7 +97,7 @@ public:
     Q_INVOKABLE void removeLocalPrecondition(QConstraint *localPrecondition);
     Q_INVOKABLE QList<QInputPin *> inputs() const;
     Q_INVOKABLE QList<QOutputPin *> outputs() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qactionexecutionspecification.cpp b/src/uml/qactionexecutionspecification.cpp
index 6873a8dd..e5623dda 100644
--- a/src/uml/qactionexecutionspecification.cpp
+++ b/src/uml/qactionexecutionspecification.cpp
@@ -106,18 +106,6 @@ void QActionExecutionSpecification::setAction(QAction *action)
     }
 }
 
-void QActionExecutionSpecification::registerMetaTypes() const
-{
-    qRegisterMetaType<QAction *>("QAction *");
-    qRegisterMetaType<QSet<QAction *>>("QSet<QAction *>");
-    qRegisterMetaType<QList<QAction *>>("QList<QAction *>");
-
-    QExecutionSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QActionExecutionSpecification::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QActionExecutionSpecification")][QString::fromLatin1("action")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qactionexecutionspecification.h b/src/uml/qactionexecutionspecification.h
index e871f058..bcdc496c 100644
--- a/src/uml/qactionexecutionspecification.h
+++ b/src/uml/qactionexecutionspecification.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QActionExecutionSpecification
     Q_INVOKABLE QAction *action() const;
     Q_INVOKABLE void setAction(QAction *action);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qactioninputpin.cpp b/src/uml/qactioninputpin.cpp
index 9f548ed1..2256ef02 100644
--- a/src/uml/qactioninputpin.cpp
+++ b/src/uml/qactioninputpin.cpp
@@ -114,18 +114,6 @@ void QActionInputPin::setFromAction(QAction *fromAction)
     }
 }
 
-void QActionInputPin::registerMetaTypes() const
-{
-    qRegisterMetaType<QAction *>("QAction *");
-    qRegisterMetaType<QSet<QAction *>>("QSet<QAction *>");
-    qRegisterMetaType<QList<QAction *>>("QList<QAction *>");
-
-    QInputPin::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QActionInputPin::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QActionInputPin")][QString::fromLatin1("fromAction")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qactioninputpin.h b/src/uml/qactioninputpin.h
index 5c1320e4..be49304f 100644
--- a/src/uml/qactioninputpin.h
+++ b/src/uml/qactioninputpin.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QActionInputPin
     Q_INVOKABLE QAction *fromAction() const;
     Q_INVOKABLE void setFromAction(QAction *fromAction);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qactivity.cpp b/src/uml/qactivity.cpp
index 782ca0ee..ae843026 100644
--- a/src/uml/qactivity.cpp
+++ b/src/uml/qactivity.cpp
@@ -407,38 +407,6 @@ void QActivity::removeEdge(QActivityEdge *edge)
     }
 }
 
-void QActivity::registerMetaTypes() const
-{
-    qRegisterMetaType<QStructuredActivityNode *>("QStructuredActivityNode *");
-    qRegisterMetaType<QSet<QStructuredActivityNode *>>("QSet<QStructuredActivityNode *>");
-    qRegisterMetaType<QList<QStructuredActivityNode *>>("QList<QStructuredActivityNode *>");
-
-    qRegisterMetaType<QVariable *>("QVariable *");
-    qRegisterMetaType<QSet<QVariable *>>("QSet<QVariable *>");
-    qRegisterMetaType<QList<QVariable *>>("QList<QVariable *>");
-
-    qRegisterMetaType<QActivityPartition *>("QActivityPartition *");
-    qRegisterMetaType<QSet<QActivityPartition *>>("QSet<QActivityPartition *>");
-    qRegisterMetaType<QList<QActivityPartition *>>("QList<QActivityPartition *>");
-
-    qRegisterMetaType<QActivityGroup *>("QActivityGroup *");
-    qRegisterMetaType<QSet<QActivityGroup *>>("QSet<QActivityGroup *>");
-    qRegisterMetaType<QList<QActivityGroup *>>("QList<QActivityGroup *>");
-
-    qRegisterMetaType<QActivityEdge *>("QActivityEdge *");
-    qRegisterMetaType<QSet<QActivityEdge *>>("QSet<QActivityEdge *>");
-    qRegisterMetaType<QList<QActivityEdge *>>("QList<QActivityEdge *>");
-
-    qRegisterMetaType<QActivityNode *>("QActivityNode *");
-    qRegisterMetaType<QSet<QActivityNode *>>("QSet<QActivityNode *>");
-    qRegisterMetaType<QList<QActivityNode *>>("QList<QActivityNode *>");
-
-    QBehavior::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QActivity::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QActivity")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qactivity.h b/src/uml/qactivity.h
index e61e7f38..f6acf1b6 100644
--- a/src/uml/qactivity.h
+++ b/src/uml/qactivity.h
@@ -123,7 +123,7 @@ public:
     Q_INVOKABLE void removeGroup(QWrappedObjectPointer<QStructuredActivityNode> structuredNode);
     Q_INVOKABLE void addNode(QWrappedObjectPointer<QStructuredActivityNode> structuredNode);
     Q_INVOKABLE void removeNode(QWrappedObjectPointer<QStructuredActivityNode> structuredNode);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qactivityedge.cpp b/src/uml/qactivityedge.cpp
index 3622ad52..47e6f355 100644
--- a/src/uml/qactivityedge.cpp
+++ b/src/uml/qactivityedge.cpp
@@ -433,42 +433,6 @@ void QActivityEdge::setTarget(QActivityNode *target)
     }
 }
 
-void QActivityEdge::registerMetaTypes() const
-{
-    qRegisterMetaType<QInterruptibleActivityRegion *>("QInterruptibleActivityRegion *");
-    qRegisterMetaType<QSet<QInterruptibleActivityRegion *>>("QSet<QInterruptibleActivityRegion *>");
-    qRegisterMetaType<QList<QInterruptibleActivityRegion *>>("QList<QInterruptibleActivityRegion *>");
-
-    qRegisterMetaType<QActivityNode *>("QActivityNode *");
-    qRegisterMetaType<QSet<QActivityNode *>>("QSet<QActivityNode *>");
-    qRegisterMetaType<QList<QActivityNode *>>("QList<QActivityNode *>");
-
-    qRegisterMetaType<QStructuredActivityNode *>("QStructuredActivityNode *");
-    qRegisterMetaType<QSet<QStructuredActivityNode *>>("QSet<QStructuredActivityNode *>");
-    qRegisterMetaType<QList<QStructuredActivityNode *>>("QList<QStructuredActivityNode *>");
-
-    qRegisterMetaType<QActivityPartition *>("QActivityPartition *");
-    qRegisterMetaType<QSet<QActivityPartition *>>("QSet<QActivityPartition *>");
-    qRegisterMetaType<QList<QActivityPartition *>>("QList<QActivityPartition *>");
-
-    qRegisterMetaType<QActivity *>("QActivity *");
-    qRegisterMetaType<QSet<QActivity *>>("QSet<QActivity *>");
-    qRegisterMetaType<QList<QActivity *>>("QList<QActivity *>");
-
-    qRegisterMetaType<QActivityGroup *>("QActivityGroup *");
-    qRegisterMetaType<QSet<QActivityGroup *>>("QSet<QActivityGroup *>");
-    qRegisterMetaType<QList<QActivityGroup *>>("QList<QActivityGroup *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QRedefinableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QActivityEdge::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityEdge")][QString::fromLatin1("source")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qactivityedge.h b/src/uml/qactivityedge.h
index 7a189712..99613021 100644
--- a/src/uml/qactivityedge.h
+++ b/src/uml/qactivityedge.h
@@ -110,7 +110,7 @@ public:
     Q_INVOKABLE void setInStructuredNode(QStructuredActivityNode *inStructuredNode);
     Q_INVOKABLE QActivityNode *target() const;
     Q_INVOKABLE void setTarget(QActivityNode *target);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qactivityfinalnode.cpp b/src/uml/qactivityfinalnode.cpp
index bc920be5..b4274b53 100644
--- a/src/uml/qactivityfinalnode.cpp
+++ b/src/uml/qactivityfinalnode.cpp
@@ -78,14 +78,6 @@ QActivityFinalNode::~QActivityFinalNode()
 {
 }
 
-void QActivityFinalNode::registerMetaTypes() const
-{
-    QFinalNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QActivityFinalNode::setPropertyData()
 {
     QFinalNode::setPropertyData();
diff --git a/src/uml/qactivityfinalnode.h b/src/uml/qactivityfinalnode.h
index 096cb56f..548efea0 100644
--- a/src/uml/qactivityfinalnode.h
+++ b/src/uml/qactivityfinalnode.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QActivityFinalNode : public QFinalNode
 public:
     Q_INVOKABLE explicit QActivityFinalNode(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QActivityFinalNode();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qactivitygroup.cpp b/src/uml/qactivitygroup.cpp
index 53effb3f..a4f394b0 100644
--- a/src/uml/qactivitygroup.cpp
+++ b/src/uml/qactivitygroup.cpp
@@ -273,26 +273,6 @@ QActivityGroup *QActivityGroup::superGroup() const
     return d->superGroup;
 }
 
-void QActivityGroup::registerMetaTypes() const
-{
-    qRegisterMetaType<QActivity *>("QActivity *");
-    qRegisterMetaType<QSet<QActivity *>>("QSet<QActivity *>");
-    qRegisterMetaType<QList<QActivity *>>("QList<QActivity *>");
-
-    qRegisterMetaType<QActivityEdge *>("QActivityEdge *");
-    qRegisterMetaType<QSet<QActivityEdge *>>("QSet<QActivityEdge *>");
-    qRegisterMetaType<QList<QActivityEdge *>>("QList<QActivityEdge *>");
-
-    qRegisterMetaType<QActivityNode *>("QActivityNode *");
-    qRegisterMetaType<QSet<QActivityNode *>>("QSet<QActivityNode *>");
-    qRegisterMetaType<QList<QActivityNode *>>("QList<QActivityNode *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QActivityGroup::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityGroup")][QString::fromLatin1("inActivity")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qactivitygroup.h b/src/uml/qactivitygroup.h
index d1accfe6..48b17565 100644
--- a/src/uml/qactivitygroup.h
+++ b/src/uml/qactivitygroup.h
@@ -86,7 +86,7 @@ public:
     Q_INVOKABLE QSet<QActivityGroup *> subgroups() const;
     Q_INVOKABLE QSet<QActivityEdge *> containedEdges() const;
     Q_INVOKABLE QActivityGroup *superGroup() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qactivitynode.cpp b/src/uml/qactivitynode.cpp
index bd7f0e4d..e13c08b7 100644
--- a/src/uml/qactivitynode.cpp
+++ b/src/uml/qactivitynode.cpp
@@ -400,38 +400,6 @@ void QActivityNode::removeOutgoing(QActivityEdge *outgoing)
     }
 }
 
-void QActivityNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QActivityEdge *>("QActivityEdge *");
-    qRegisterMetaType<QSet<QActivityEdge *>>("QSet<QActivityEdge *>");
-    qRegisterMetaType<QList<QActivityEdge *>>("QList<QActivityEdge *>");
-
-    qRegisterMetaType<QStructuredActivityNode *>("QStructuredActivityNode *");
-    qRegisterMetaType<QSet<QStructuredActivityNode *>>("QSet<QStructuredActivityNode *>");
-    qRegisterMetaType<QList<QStructuredActivityNode *>>("QList<QStructuredActivityNode *>");
-
-    qRegisterMetaType<QActivityPartition *>("QActivityPartition *");
-    qRegisterMetaType<QSet<QActivityPartition *>>("QSet<QActivityPartition *>");
-    qRegisterMetaType<QList<QActivityPartition *>>("QList<QActivityPartition *>");
-
-    qRegisterMetaType<QActivityGroup *>("QActivityGroup *");
-    qRegisterMetaType<QSet<QActivityGroup *>>("QSet<QActivityGroup *>");
-    qRegisterMetaType<QList<QActivityGroup *>>("QList<QActivityGroup *>");
-
-    qRegisterMetaType<QActivity *>("QActivity *");
-    qRegisterMetaType<QSet<QActivity *>>("QSet<QActivity *>");
-    qRegisterMetaType<QList<QActivity *>>("QList<QActivity *>");
-
-    qRegisterMetaType<QInterruptibleActivityRegion *>("QInterruptibleActivityRegion *");
-    qRegisterMetaType<QSet<QInterruptibleActivityRegion *>>("QSet<QInterruptibleActivityRegion *>");
-    qRegisterMetaType<QList<QInterruptibleActivityRegion *>>("QList<QInterruptibleActivityRegion *>");
-
-    QRedefinableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QActivityNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityNode")][QString::fromLatin1("redefinedNodes")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qactivitynode.h b/src/uml/qactivitynode.h
index 9015a0ea..e127833e 100644
--- a/src/uml/qactivitynode.h
+++ b/src/uml/qactivitynode.h
@@ -106,7 +106,7 @@ public:
     Q_INVOKABLE QSet<QActivityEdge *> outgoings() const;
     Q_INVOKABLE void addOutgoing(QActivityEdge *outgoing);
     Q_INVOKABLE void removeOutgoing(QActivityEdge *outgoing);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qactivityparameternode.cpp b/src/uml/qactivityparameternode.cpp
index c6cdc460..f942107f 100644
--- a/src/uml/qactivityparameternode.cpp
+++ b/src/uml/qactivityparameternode.cpp
@@ -106,18 +106,6 @@ void QActivityParameterNode::setParameter(QParameter *parameter)
     }
 }
 
-void QActivityParameterNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QParameter *>("QParameter *");
-    qRegisterMetaType<QSet<QParameter *>>("QSet<QParameter *>");
-    qRegisterMetaType<QList<QParameter *>>("QList<QParameter *>");
-
-    QObjectNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QActivityParameterNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityParameterNode")][QString::fromLatin1("parameter")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qactivityparameternode.h b/src/uml/qactivityparameternode.h
index 12dc38ca..b7e7ea34 100644
--- a/src/uml/qactivityparameternode.h
+++ b/src/uml/qactivityparameternode.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QActivityParameterNode
     Q_INVOKABLE QParameter *parameter() const;
     Q_INVOKABLE void setParameter(QParameter *parameter);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qactivitypartition.cpp b/src/uml/qactivitypartition.cpp
index 7af28b65..5f96197f 100644
--- a/src/uml/qactivitypartition.cpp
+++ b/src/uml/qactivitypartition.cpp
@@ -336,26 +336,6 @@ void QActivityPartition::removeEdge(QActivityEdge *edge)
     }
 }
 
-void QActivityPartition::registerMetaTypes() const
-{
-    qRegisterMetaType<QElement *>("QElement *");
-    qRegisterMetaType<QSet<QElement *>>("QSet<QElement *>");
-    qRegisterMetaType<QList<QElement *>>("QList<QElement *>");
-
-    qRegisterMetaType<QActivityEdge *>("QActivityEdge *");
-    qRegisterMetaType<QSet<QActivityEdge *>>("QSet<QActivityEdge *>");
-    qRegisterMetaType<QList<QActivityEdge *>>("QList<QActivityEdge *>");
-
-    qRegisterMetaType<QActivityNode *>("QActivityNode *");
-    qRegisterMetaType<QSet<QActivityNode *>>("QSet<QActivityNode *>");
-    qRegisterMetaType<QList<QActivityNode *>>("QList<QActivityNode *>");
-
-    QActivityGroup::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QActivityPartition::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QActivityPartition")][QString::fromLatin1("isDimension")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qactivitypartition.h b/src/uml/qactivitypartition.h
index a60b9ac0..147743f7 100644
--- a/src/uml/qactivitypartition.h
+++ b/src/uml/qactivitypartition.h
@@ -103,7 +103,7 @@ public:
     Q_INVOKABLE QSet<QActivityEdge *> edges() const;
     Q_INVOKABLE void addEdge(QActivityEdge *edge);
     Q_INVOKABLE void removeEdge(QActivityEdge *edge);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qactor.cpp b/src/uml/qactor.cpp
index ae46dc70..04694c9f 100644
--- a/src/uml/qactor.cpp
+++ b/src/uml/qactor.cpp
@@ -78,14 +78,6 @@ QActor::~QActor()
 {
 }
 
-void QActor::registerMetaTypes() const
-{
-    QBehavioredClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QActor::setPropertyData()
 {
     QBehavioredClassifier::setPropertyData();
diff --git a/src/uml/qactor.h b/src/uml/qactor.h
index 739376cf..cf276204 100644
--- a/src/uml/qactor.h
+++ b/src/uml/qactor.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QActor : public QBehavioredClassifier
 public:
     Q_INVOKABLE explicit QActor(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QActor();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qaddstructuralfeaturevalueaction.cpp b/src/uml/qaddstructuralfeaturevalueaction.cpp
index 83997e1f..dd1e8f25 100644
--- a/src/uml/qaddstructuralfeaturevalueaction.cpp
+++ b/src/uml/qaddstructuralfeaturevalueaction.cpp
@@ -148,18 +148,6 @@ void QAddStructuralFeatureValueAction::setInsertAt(QInputPin *insertAt)
     }
 }
 
-void QAddStructuralFeatureValueAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QWriteStructuralFeatureAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QAddStructuralFeatureValueAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QAddStructuralFeatureValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qaddstructuralfeaturevalueaction.h b/src/uml/qaddstructuralfeaturevalueaction.h
index 622edd5d..6e58b2f8 100644
--- a/src/uml/qaddstructuralfeaturevalueaction.h
+++ b/src/uml/qaddstructuralfeaturevalueaction.h
@@ -79,7 +79,7 @@ public:
     // Association ends from QAddStructuralFeatureValueAction
     Q_INVOKABLE QInputPin *insertAt() const;
     Q_INVOKABLE void setInsertAt(QInputPin *insertAt);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qaddvariablevalueaction.cpp b/src/uml/qaddvariablevalueaction.cpp
index c945916a..d6228247 100644
--- a/src/uml/qaddvariablevalueaction.cpp
+++ b/src/uml/qaddvariablevalueaction.cpp
@@ -148,18 +148,6 @@ void QAddVariableValueAction::setInsertAt(QInputPin *insertAt)
     }
 }
 
-void QAddVariableValueAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QWriteVariableAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QAddVariableValueAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QAddVariableValueAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qaddvariablevalueaction.h b/src/uml/qaddvariablevalueaction.h
index 92e906f4..fc9a22fc 100644
--- a/src/uml/qaddvariablevalueaction.h
+++ b/src/uml/qaddvariablevalueaction.h
@@ -79,7 +79,7 @@ public:
     // Association ends from QAddVariableValueAction
     Q_INVOKABLE QInputPin *insertAt() const;
     Q_INVOKABLE void setInsertAt(QInputPin *insertAt);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qanyreceiveevent.cpp b/src/uml/qanyreceiveevent.cpp
index f1826c1f..b6fcce70 100644
--- a/src/uml/qanyreceiveevent.cpp
+++ b/src/uml/qanyreceiveevent.cpp
@@ -78,14 +78,6 @@ QAnyReceiveEvent::~QAnyReceiveEvent()
 {
 }
 
-void QAnyReceiveEvent::registerMetaTypes() const
-{
-    QMessageEvent::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QAnyReceiveEvent::setPropertyData()
 {
     QMessageEvent::setPropertyData();
diff --git a/src/uml/qanyreceiveevent.h b/src/uml/qanyreceiveevent.h
index 52cd515a..39a5cbf9 100644
--- a/src/uml/qanyreceiveevent.h
+++ b/src/uml/qanyreceiveevent.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QAnyReceiveEvent : public QMessageEvent
 public:
     Q_INVOKABLE explicit QAnyReceiveEvent(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QAnyReceiveEvent();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qartifact.cpp b/src/uml/qartifact.cpp
index c4696f43..dbc42683 100644
--- a/src/uml/qartifact.cpp
+++ b/src/uml/qartifact.cpp
@@ -836,26 +836,6 @@ void QArtifact::removeNestedArtifact(QArtifact *nestedArtifact)
     }
 }
 
-void QArtifact::registerMetaTypes() const
-{
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QManifestation *>("QManifestation *");
-    qRegisterMetaType<QSet<QManifestation *>>("QSet<QManifestation *>");
-    qRegisterMetaType<QList<QManifestation *>>("QList<QManifestation *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QArtifact::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QArtifact")][QString::fromLatin1("fileName")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qartifact.h b/src/uml/qartifact.h
index 0c0f5bb4..50f76799 100644
--- a/src/uml/qartifact.h
+++ b/src/uml/qartifact.h
@@ -212,7 +212,7 @@ public:
     // Overriden methods for subsetted properties
     Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QManifestation> manifestation);
     Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QManifestation> manifestation);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qassociation.cpp b/src/uml/qassociation.cpp
index 0824d23e..72dd778f 100644
--- a/src/uml/qassociation.cpp
+++ b/src/uml/qassociation.cpp
@@ -841,22 +841,6 @@ void QAssociation::removeMemberEnd(QProperty *memberEnd)
     }
 }
 
-void QAssociation::registerMetaTypes() const
-{
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QAssociation::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QAssociation")][QString::fromLatin1("isDerived")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qassociation.h b/src/uml/qassociation.h
index c55c6c2e..c06f48f4 100644
--- a/src/uml/qassociation.h
+++ b/src/uml/qassociation.h
@@ -205,7 +205,7 @@ public:
     Q_INVOKABLE QList<QProperty *> memberEnds() const;
     Q_INVOKABLE void addMemberEnd(QProperty *memberEnd);
     Q_INVOKABLE void removeMemberEnd(QProperty *memberEnd);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qassociationclass.cpp b/src/uml/qassociationclass.cpp
index 07c9dd8f..fa10b634 100644
--- a/src/uml/qassociationclass.cpp
+++ b/src/uml/qassociationclass.cpp
@@ -82,14 +82,6 @@ QAssociationClass::~QAssociationClass()
 {
 }
 
-void QAssociationClass::registerMetaTypes() const
-{
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QAssociationClass::setPropertyData()
 {
     QWrappedObject::setPropertyData();
diff --git a/src/uml/qassociationclass.h b/src/uml/qassociationclass.h
index d493f272..4024cfbd 100644
--- a/src/uml/qassociationclass.h
+++ b/src/uml/qassociationclass.h
@@ -67,7 +67,7 @@ class Q_UML_EXPORT QAssociationClass : public QWrappedObject
 public:
     Q_INVOKABLE explicit QAssociationClass(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QAssociationClass();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qbehavior.cpp b/src/uml/qbehavior.cpp
index 5aaebf4d..beee3d21 100644
--- a/src/uml/qbehavior.cpp
+++ b/src/uml/qbehavior.cpp
@@ -349,34 +349,6 @@ QBehavioredClassifier *QBehavior::context() const
     return 0; // change here to your derived return
 }
 
-void QBehavior::registerMetaTypes() const
-{
-    qRegisterMetaType<QBehavioralFeature *>("QBehavioralFeature *");
-    qRegisterMetaType<QSet<QBehavioralFeature *>>("QSet<QBehavioralFeature *>");
-    qRegisterMetaType<QList<QBehavioralFeature *>>("QList<QBehavioralFeature *>");
-
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QParameter *>("QParameter *");
-    qRegisterMetaType<QSet<QParameter *>>("QSet<QParameter *>");
-    qRegisterMetaType<QList<QParameter *>>("QList<QParameter *>");
-
-    qRegisterMetaType<QBehavioredClassifier *>("QBehavioredClassifier *");
-    qRegisterMetaType<QSet<QBehavioredClassifier *>>("QSet<QBehavioredClassifier *>");
-    qRegisterMetaType<QList<QBehavioredClassifier *>>("QList<QBehavioredClassifier *>");
-
-    qRegisterMetaType<QParameterSet *>("QParameterSet *");
-    qRegisterMetaType<QSet<QParameterSet *>>("QSet<QParameterSet *>");
-    qRegisterMetaType<QList<QParameterSet *>>("QList<QParameterSet *>");
-
-    QClass::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QBehavior::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavior")][QString::fromLatin1("isReentrant")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qbehavior.h b/src/uml/qbehavior.h
index 88fe739f..432ce88d 100644
--- a/src/uml/qbehavior.h
+++ b/src/uml/qbehavior.h
@@ -116,7 +116,7 @@ public:
     // Overriden methods for subsetted properties
     Q_INVOKABLE void addRedefinedClassifier(QWrappedObjectPointer<QBehavior> redefinedBehavior);
     Q_INVOKABLE void removeRedefinedClassifier(QWrappedObjectPointer<QBehavior> redefinedBehavior);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qbehavioralfeature.cpp b/src/uml/qbehavioralfeature.cpp
index 18fe91e8..a202c227 100644
--- a/src/uml/qbehavioralfeature.cpp
+++ b/src/uml/qbehavioralfeature.cpp
@@ -591,34 +591,6 @@ bool QBehavioralFeature::isDistinguishableFrom(const QNamedElement *n, const QNa
     return bool(); // change here to your derived return
 }
 
-void QBehavioralFeature::registerMetaTypes() const
-{
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    qRegisterMetaType<QParameterSet *>("QParameterSet *");
-    qRegisterMetaType<QSet<QParameterSet *>>("QSet<QParameterSet *>");
-    qRegisterMetaType<QList<QParameterSet *>>("QList<QParameterSet *>");
-
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    qRegisterMetaType<QParameter *>("QParameter *");
-    qRegisterMetaType<QSet<QParameter *>>("QSet<QParameter *>");
-    qRegisterMetaType<QList<QParameter *>>("QList<QParameter *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QBehavioralFeature::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioralFeature")][QString::fromLatin1("concurrency")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qbehavioralfeature.h b/src/uml/qbehavioralfeature.h
index 89104941..c9fd3069 100644
--- a/src/uml/qbehavioralfeature.h
+++ b/src/uml/qbehavioralfeature.h
@@ -166,7 +166,7 @@ public:
 
     // Operations
     Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qbehavioredclassifier.cpp b/src/uml/qbehavioredclassifier.cpp
index f20f5483..e54be5c7 100644
--- a/src/uml/qbehavioredclassifier.cpp
+++ b/src/uml/qbehavioredclassifier.cpp
@@ -197,22 +197,6 @@ void QBehavioredClassifier::setClassifierBehavior(QBehavior *classifierBehavior)
     }
 }
 
-void QBehavioredClassifier::registerMetaTypes() const
-{
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    qRegisterMetaType<QInterfaceRealization *>("QInterfaceRealization *");
-    qRegisterMetaType<QSet<QInterfaceRealization *>>("QSet<QInterfaceRealization *>");
-    qRegisterMetaType<QList<QInterfaceRealization *>>("QList<QInterfaceRealization *>");
-
-    QClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QBehavioredClassifier::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QBehavioredClassifier")][QString::fromLatin1("ownedBehaviors")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qbehavioredclassifier.h b/src/uml/qbehavioredclassifier.h
index 4a92f1cf..efe1193f 100644
--- a/src/uml/qbehavioredclassifier.h
+++ b/src/uml/qbehavioredclassifier.h
@@ -92,7 +92,7 @@ public:
     // Overriden methods for subsetted properties
     Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QInterfaceRealization> interfaceRealization);
     Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QInterfaceRealization> interfaceRealization);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qbehaviorexecutionspecification.cpp b/src/uml/qbehaviorexecutionspecification.cpp
index 2c6901a9..d0f82975 100644
--- a/src/uml/qbehaviorexecutionspecification.cpp
+++ b/src/uml/qbehaviorexecutionspecification.cpp
@@ -106,18 +106,6 @@ void QBehaviorExecutionSpecification::setBehavior(QBehavior *behavior)
     }
 }
 
-void QBehaviorExecutionSpecification::registerMetaTypes() const
-{
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    QExecutionSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QBehaviorExecutionSpecification::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QBehaviorExecutionSpecification")][QString::fromLatin1("behavior")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qbehaviorexecutionspecification.h b/src/uml/qbehaviorexecutionspecification.h
index d1088a8c..f4a467ee 100644
--- a/src/uml/qbehaviorexecutionspecification.h
+++ b/src/uml/qbehaviorexecutionspecification.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QBehaviorExecutionSpecification
     Q_INVOKABLE QBehavior *behavior() const;
     Q_INVOKABLE void setBehavior(QBehavior *behavior);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qbroadcastsignalaction.cpp b/src/uml/qbroadcastsignalaction.cpp
index a849eee7..acd02403 100644
--- a/src/uml/qbroadcastsignalaction.cpp
+++ b/src/uml/qbroadcastsignalaction.cpp
@@ -106,18 +106,6 @@ void QBroadcastSignalAction::setSignal(QSignal *signal)
     }
 }
 
-void QBroadcastSignalAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QSignal *>("QSignal *");
-    qRegisterMetaType<QSet<QSignal *>>("QSet<QSignal *>");
-    qRegisterMetaType<QList<QSignal *>>("QList<QSignal *>");
-
-    QInvocationAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QBroadcastSignalAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QBroadcastSignalAction")][QString::fromLatin1("signal")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qbroadcastsignalaction.h b/src/uml/qbroadcastsignalaction.h
index 08a81417..bde60fea 100644
--- a/src/uml/qbroadcastsignalaction.h
+++ b/src/uml/qbroadcastsignalaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QBroadcastSignalAction
     Q_INVOKABLE QSignal *signal() const;
     Q_INVOKABLE void setSignal(QSignal *signal);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcallaction.cpp b/src/uml/qcallaction.cpp
index bcd9110c..f4a33121 100644
--- a/src/uml/qcallaction.cpp
+++ b/src/uml/qcallaction.cpp
@@ -155,18 +155,6 @@ void QCallAction::removeResult(QOutputPin *result)
     }
 }
 
-void QCallAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QInvocationAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCallAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QCallAction")][QString::fromLatin1("isSynchronous")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcallaction.h b/src/uml/qcallaction.h
index 1f5adfa4..f8d52653 100644
--- a/src/uml/qcallaction.h
+++ b/src/uml/qcallaction.h
@@ -83,7 +83,7 @@ public:
     Q_INVOKABLE QList<QOutputPin *> results() const;
     Q_INVOKABLE void addResult(QOutputPin *result);
     Q_INVOKABLE void removeResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcallbehavioraction.cpp b/src/uml/qcallbehavioraction.cpp
index d0762094..215de8f1 100644
--- a/src/uml/qcallbehavioraction.cpp
+++ b/src/uml/qcallbehavioraction.cpp
@@ -106,18 +106,6 @@ void QCallBehaviorAction::setBehavior(QBehavior *behavior)
     }
 }
 
-void QCallBehaviorAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    QCallAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCallBehaviorAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QCallBehaviorAction")][QString::fromLatin1("behavior")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcallbehavioraction.h b/src/uml/qcallbehavioraction.h
index 04dab0c6..a74fb59f 100644
--- a/src/uml/qcallbehavioraction.h
+++ b/src/uml/qcallbehavioraction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QCallBehaviorAction
     Q_INVOKABLE QBehavior *behavior() const;
     Q_INVOKABLE void setBehavior(QBehavior *behavior);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcallevent.cpp b/src/uml/qcallevent.cpp
index 12cd145b..fddc75ac 100644
--- a/src/uml/qcallevent.cpp
+++ b/src/uml/qcallevent.cpp
@@ -106,18 +106,6 @@ void QCallEvent::setOperation(QOperation *operation)
     }
 }
 
-void QCallEvent::registerMetaTypes() const
-{
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    QMessageEvent::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCallEvent::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QCallEvent")][QString::fromLatin1("operation")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcallevent.h b/src/uml/qcallevent.h
index 89519c0b..a9beebbe 100644
--- a/src/uml/qcallevent.h
+++ b/src/uml/qcallevent.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QCallEvent
     Q_INVOKABLE QOperation *operation() const;
     Q_INVOKABLE void setOperation(QOperation *operation);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcalloperationaction.cpp b/src/uml/qcalloperationaction.cpp
index 1ad640e2..e8dbdf8f 100644
--- a/src/uml/qcalloperationaction.cpp
+++ b/src/uml/qcalloperationaction.cpp
@@ -137,22 +137,6 @@ void QCallOperationAction::setTarget(QInputPin *target)
     }
 }
 
-void QCallOperationAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QCallAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCallOperationAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QCallOperationAction")][QString::fromLatin1("operation")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcalloperationaction.h b/src/uml/qcalloperationaction.h
index abfab372..f6d763f6 100644
--- a/src/uml/qcalloperationaction.h
+++ b/src/uml/qcalloperationaction.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setOperation(QOperation *operation);
     Q_INVOKABLE QInputPin *target() const;
     Q_INVOKABLE void setTarget(QInputPin *target);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcentralbuffernode.cpp b/src/uml/qcentralbuffernode.cpp
index 7c5104c0..4ba67d0a 100644
--- a/src/uml/qcentralbuffernode.cpp
+++ b/src/uml/qcentralbuffernode.cpp
@@ -78,14 +78,6 @@ QCentralBufferNode::~QCentralBufferNode()
 {
 }
 
-void QCentralBufferNode::registerMetaTypes() const
-{
-    QObjectNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCentralBufferNode::setPropertyData()
 {
     QObjectNode::setPropertyData();
diff --git a/src/uml/qcentralbuffernode.h b/src/uml/qcentralbuffernode.h
index ffdd0db1..7907e688 100644
--- a/src/uml/qcentralbuffernode.h
+++ b/src/uml/qcentralbuffernode.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QCentralBufferNode : public QObjectNode
 public:
     Q_INVOKABLE explicit QCentralBufferNode(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QCentralBufferNode();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qchangeevent.cpp b/src/uml/qchangeevent.cpp
index 60042c26..c3c28c71 100644
--- a/src/uml/qchangeevent.cpp
+++ b/src/uml/qchangeevent.cpp
@@ -114,18 +114,6 @@ void QChangeEvent::setChangeExpression(QValueSpecification *changeExpression)
     }
 }
 
-void QChangeEvent::registerMetaTypes() const
-{
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QEvent::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QChangeEvent::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QChangeEvent")][QString::fromLatin1("changeExpression")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qchangeevent.h b/src/uml/qchangeevent.h
index 578911df..ddbeb617 100644
--- a/src/uml/qchangeevent.h
+++ b/src/uml/qchangeevent.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QChangeEvent
     Q_INVOKABLE QValueSpecification *changeExpression() const;
     Q_INVOKABLE void setChangeExpression(QValueSpecification *changeExpression);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qclass.cpp b/src/uml/qclass.cpp
index 8c48638b..5d5bd497 100644
--- a/src/uml/qclass.cpp
+++ b/src/uml/qclass.cpp
@@ -1047,38 +1047,6 @@ QSet<QNamedElement *> QClass::inherit(QSet<QNamedElement *> inhs) const
     return QSet<QNamedElement *>(); // change here to your derived return
 }
 
-void QClass::registerMetaTypes() const
-{
-    qRegisterMetaType<QReception *>("QReception *");
-    qRegisterMetaType<QSet<QReception *>>("QSet<QReception *>");
-    qRegisterMetaType<QList<QReception *>>("QList<QReception *>");
-
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QExtension *>("QExtension *");
-    qRegisterMetaType<QSet<QExtension *>>("QSet<QExtension *>");
-    qRegisterMetaType<QList<QExtension *>>("QList<QExtension *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QClass::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QClass")][QString::fromLatin1("isAbstract")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qclass.h b/src/uml/qclass.h
index 0c18557c..f3b4bc08 100644
--- a/src/uml/qclass.h
+++ b/src/uml/qclass.h
@@ -235,7 +235,7 @@ public:
 
     // Operations
     Q_INVOKABLE QSet<QNamedElement *> inherit(QSet<QNamedElement *> inhs) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qclassifier.cpp b/src/uml/qclassifier.cpp
index 0d82f36b..0ac35066 100644
--- a/src/uml/qclassifier.cpp
+++ b/src/uml/qclassifier.cpp
@@ -1062,54 +1062,6 @@ QSet<QClassifier *> QClassifier::parents() const
     return QSet<QClassifier *>(); // change here to your derived return
 }
 
-void QClassifier::registerMetaTypes() const
-{
-    qRegisterMetaType<QRedefinableTemplateSignature *>("QRedefinableTemplateSignature *");
-    qRegisterMetaType<QSet<QRedefinableTemplateSignature *>>("QSet<QRedefinableTemplateSignature *>");
-    qRegisterMetaType<QList<QRedefinableTemplateSignature *>>("QList<QRedefinableTemplateSignature *>");
-
-    qRegisterMetaType<QClassifierTemplateParameter *>("QClassifierTemplateParameter *");
-    qRegisterMetaType<QSet<QClassifierTemplateParameter *>>("QSet<QClassifierTemplateParameter *>");
-    qRegisterMetaType<QList<QClassifierTemplateParameter *>>("QList<QClassifierTemplateParameter *>");
-
-    qRegisterMetaType<QUseCase *>("QUseCase *");
-    qRegisterMetaType<QSet<QUseCase *>>("QSet<QUseCase *>");
-    qRegisterMetaType<QList<QUseCase *>>("QList<QUseCase *>");
-
-    qRegisterMetaType<QSubstitution *>("QSubstitution *");
-    qRegisterMetaType<QSet<QSubstitution *>>("QSet<QSubstitution *>");
-    qRegisterMetaType<QList<QSubstitution *>>("QList<QSubstitution *>");
-
-    qRegisterMetaType<QGeneralizationSet *>("QGeneralizationSet *");
-    qRegisterMetaType<QSet<QGeneralizationSet *>>("QSet<QGeneralizationSet *>");
-    qRegisterMetaType<QList<QGeneralizationSet *>>("QList<QGeneralizationSet *>");
-
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QGeneralization *>("QGeneralization *");
-    qRegisterMetaType<QSet<QGeneralization *>>("QSet<QGeneralization *>");
-    qRegisterMetaType<QList<QGeneralization *>>("QList<QGeneralization *>");
-
-    qRegisterMetaType<QCollaborationUse *>("QCollaborationUse *");
-    qRegisterMetaType<QSet<QCollaborationUse *>>("QSet<QCollaborationUse *>");
-    qRegisterMetaType<QList<QCollaborationUse *>>("QList<QCollaborationUse *>");
-
-    qRegisterMetaType<QFeature *>("QFeature *");
-    qRegisterMetaType<QSet<QFeature *>>("QSet<QFeature *>");
-    qRegisterMetaType<QList<QFeature *>>("QList<QFeature *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QClassifier::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifier")][QString::fromLatin1("isAbstract")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qclassifier.h b/src/uml/qclassifier.h
index 13649ef1..6e2fde0f 100644
--- a/src/uml/qclassifier.h
+++ b/src/uml/qclassifier.h
@@ -223,7 +223,7 @@ public:
     // Overriden methods for subsetted properties
     Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QSubstitution> substitution);
     Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QSubstitution> substitution);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qclassifiertemplateparameter.cpp b/src/uml/qclassifiertemplateparameter.cpp
index 355f87b3..0d58cbd5 100644
--- a/src/uml/qclassifiertemplateparameter.cpp
+++ b/src/uml/qclassifiertemplateparameter.cpp
@@ -176,18 +176,6 @@ void QClassifierTemplateParameter::removeConstrainingClassifier(QClassifier *con
     }
 }
 
-void QClassifierTemplateParameter::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    QTemplateParameter::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QClassifierTemplateParameter::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QClassifierTemplateParameter")][QString::fromLatin1("allowSubstitutable")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qclassifiertemplateparameter.h b/src/uml/qclassifiertemplateparameter.h
index 2f199c55..db209e3e 100644
--- a/src/uml/qclassifiertemplateparameter.h
+++ b/src/uml/qclassifiertemplateparameter.h
@@ -86,7 +86,7 @@ public:
     Q_INVOKABLE QSet<QClassifier *> constrainingClassifiers() const;
     Q_INVOKABLE void addConstrainingClassifier(QClassifier *constrainingClassifier);
     Q_INVOKABLE void removeConstrainingClassifier(QClassifier *constrainingClassifier);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qclause.cpp b/src/uml/qclause.cpp
index 4806e2c8..ab551c84 100644
--- a/src/uml/qclause.cpp
+++ b/src/uml/qclause.cpp
@@ -276,22 +276,6 @@ void QClause::removeTest(QExecutableNode *test)
     }
 }
 
-void QClause::registerMetaTypes() const
-{
-    qRegisterMetaType<QExecutableNode *>("QExecutableNode *");
-    qRegisterMetaType<QSet<QExecutableNode *>>("QSet<QExecutableNode *>");
-    qRegisterMetaType<QList<QExecutableNode *>>("QList<QExecutableNode *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QClause::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QClause")][QString::fromLatin1("successorClauses")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qclause.h b/src/uml/qclause.h
index 9ac8a39b..03dda1cd 100644
--- a/src/uml/qclause.h
+++ b/src/uml/qclause.h
@@ -98,7 +98,7 @@ public:
     Q_INVOKABLE QSet<QExecutableNode *> tests() const;
     Q_INVOKABLE void addTest(QExecutableNode *test);
     Q_INVOKABLE void removeTest(QExecutableNode *test);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qclearassociationaction.cpp b/src/uml/qclearassociationaction.cpp
index 50a27afd..85b62c6e 100644
--- a/src/uml/qclearassociationaction.cpp
+++ b/src/uml/qclearassociationaction.cpp
@@ -137,22 +137,6 @@ void QClearAssociationAction::setAssociation(QAssociation *association)
     }
 }
 
-void QClearAssociationAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QAssociation *>("QAssociation *");
-    qRegisterMetaType<QSet<QAssociation *>>("QSet<QAssociation *>");
-    qRegisterMetaType<QList<QAssociation *>>("QList<QAssociation *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QClearAssociationAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QClearAssociationAction")][QString::fromLatin1("object")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qclearassociationaction.h b/src/uml/qclearassociationaction.h
index fa72ee4d..a6eb53ad 100644
--- a/src/uml/qclearassociationaction.h
+++ b/src/uml/qclearassociationaction.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setObject(QInputPin *object);
     Q_INVOKABLE QAssociation *association() const;
     Q_INVOKABLE void setAssociation(QAssociation *association);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qclearstructuralfeatureaction.cpp b/src/uml/qclearstructuralfeatureaction.cpp
index a911a9b8..6851fbe9 100644
--- a/src/uml/qclearstructuralfeatureaction.cpp
+++ b/src/uml/qclearstructuralfeatureaction.cpp
@@ -114,18 +114,6 @@ void QClearStructuralFeatureAction::setResult(QOutputPin *result)
     }
 }
 
-void QClearStructuralFeatureAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QStructuralFeatureAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QClearStructuralFeatureAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QClearStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qclearstructuralfeatureaction.h b/src/uml/qclearstructuralfeatureaction.h
index 017056e5..1b1072c0 100644
--- a/src/uml/qclearstructuralfeatureaction.h
+++ b/src/uml/qclearstructuralfeatureaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QClearStructuralFeatureAction
     Q_INVOKABLE QOutputPin *result() const;
     Q_INVOKABLE void setResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qclearvariableaction.cpp b/src/uml/qclearvariableaction.cpp
index f78ae2bb..e697bcfd 100644
--- a/src/uml/qclearvariableaction.cpp
+++ b/src/uml/qclearvariableaction.cpp
@@ -78,14 +78,6 @@ QClearVariableAction::~QClearVariableAction()
 {
 }
 
-void QClearVariableAction::registerMetaTypes() const
-{
-    QVariableAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QClearVariableAction::setPropertyData()
 {
     QVariableAction::setPropertyData();
diff --git a/src/uml/qclearvariableaction.h b/src/uml/qclearvariableaction.h
index dee251ad..2d069b65 100644
--- a/src/uml/qclearvariableaction.h
+++ b/src/uml/qclearvariableaction.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QClearVariableAction : public QVariableAction
 public:
     Q_INVOKABLE explicit QClearVariableAction(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QClearVariableAction();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcollaboration.cpp b/src/uml/qcollaboration.cpp
index 659c2f6a..f4551238 100644
--- a/src/uml/qcollaboration.cpp
+++ b/src/uml/qcollaboration.cpp
@@ -801,18 +801,6 @@ void QCollaboration::removeCollaborationRole(QConnectableElement *collaborationR
     }
 }
 
-void QCollaboration::registerMetaTypes() const
-{
-    qRegisterMetaType<QConnectableElement *>("QConnectableElement *");
-    qRegisterMetaType<QSet<QConnectableElement *>>("QSet<QConnectableElement *>");
-    qRegisterMetaType<QList<QConnectableElement *>>("QList<QConnectableElement *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCollaboration::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaboration")][QString::fromLatin1("collaborationRoles")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcollaboration.h b/src/uml/qcollaboration.h
index db23a44f..1141ec0f 100644
--- a/src/uml/qcollaboration.h
+++ b/src/uml/qcollaboration.h
@@ -204,7 +204,7 @@ public:
     Q_INVOKABLE QSet<QConnectableElement *> collaborationRoles() const;
     Q_INVOKABLE void addCollaborationRole(QConnectableElement *collaborationRole);
     Q_INVOKABLE void removeCollaborationRole(QConnectableElement *collaborationRole);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcollaborationuse.cpp b/src/uml/qcollaborationuse.cpp
index ecb6596b..ea1b7721 100644
--- a/src/uml/qcollaborationuse.cpp
+++ b/src/uml/qcollaborationuse.cpp
@@ -144,22 +144,6 @@ void QCollaborationUse::removeRoleBinding(QDependency *roleBinding)
     }
 }
 
-void QCollaborationUse::registerMetaTypes() const
-{
-    qRegisterMetaType<QDependency *>("QDependency *");
-    qRegisterMetaType<QSet<QDependency *>>("QSet<QDependency *>");
-    qRegisterMetaType<QList<QDependency *>>("QList<QDependency *>");
-
-    qRegisterMetaType<QCollaboration *>("QCollaboration *");
-    qRegisterMetaType<QSet<QCollaboration *>>("QSet<QCollaboration *>");
-    qRegisterMetaType<QList<QCollaboration *>>("QList<QCollaboration *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCollaborationUse::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QCollaborationUse")][QString::fromLatin1("type")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcollaborationuse.h b/src/uml/qcollaborationuse.h
index 1834e28a..55565788 100644
--- a/src/uml/qcollaborationuse.h
+++ b/src/uml/qcollaborationuse.h
@@ -81,7 +81,7 @@ public:
     Q_INVOKABLE QSet<QDependency *> roleBindings() const;
     Q_INVOKABLE void addRoleBinding(QDependency *roleBinding);
     Q_INVOKABLE void removeRoleBinding(QDependency *roleBinding);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcombinedfragment.cpp b/src/uml/qcombinedfragment.cpp
index 9eaaab6b..0aa58afe 100644
--- a/src/uml/qcombinedfragment.cpp
+++ b/src/uml/qcombinedfragment.cpp
@@ -193,22 +193,6 @@ void QCombinedFragment::removeOperand(QInteractionOperand *operand)
     }
 }
 
-void QCombinedFragment::registerMetaTypes() const
-{
-    qRegisterMetaType<QGate *>("QGate *");
-    qRegisterMetaType<QSet<QGate *>>("QSet<QGate *>");
-    qRegisterMetaType<QList<QGate *>>("QList<QGate *>");
-
-    qRegisterMetaType<QInteractionOperand *>("QInteractionOperand *");
-    qRegisterMetaType<QSet<QInteractionOperand *>>("QSet<QInteractionOperand *>");
-    qRegisterMetaType<QList<QInteractionOperand *>>("QList<QInteractionOperand *>");
-
-    QInteractionFragment::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCombinedFragment::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QCombinedFragment")][QString::fromLatin1("interactionOperator")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcombinedfragment.h b/src/uml/qcombinedfragment.h
index 8a461dae..c7f9189c 100644
--- a/src/uml/qcombinedfragment.h
+++ b/src/uml/qcombinedfragment.h
@@ -92,7 +92,7 @@ public:
     Q_INVOKABLE QList<QInteractionOperand *> operands() const;
     Q_INVOKABLE void addOperand(QInteractionOperand *operand);
     Q_INVOKABLE void removeOperand(QInteractionOperand *operand);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcomment.cpp b/src/uml/qcomment.cpp
index 921b01ba..5897ae1d 100644
--- a/src/uml/qcomment.cpp
+++ b/src/uml/qcomment.cpp
@@ -138,14 +138,6 @@ void QComment::removeAnnotatedElement(QElement *annotatedElement)
     }
 }
 
-void QComment::registerMetaTypes() const
-{
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QComment::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QComment")][QString::fromLatin1("body")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcomment.h b/src/uml/qcomment.h
index 10916b23..c219766b 100644
--- a/src/uml/qcomment.h
+++ b/src/uml/qcomment.h
@@ -80,7 +80,7 @@ public:
     Q_INVOKABLE QSet<QElement *> annotatedElements() const;
     Q_INVOKABLE void addAnnotatedElement(QElement *annotatedElement);
     Q_INVOKABLE void removeAnnotatedElement(QElement *annotatedElement);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcommunicationpath.cpp b/src/uml/qcommunicationpath.cpp
index cc09c97a..624c9f44 100644
--- a/src/uml/qcommunicationpath.cpp
+++ b/src/uml/qcommunicationpath.cpp
@@ -78,14 +78,6 @@ QCommunicationPath::~QCommunicationPath()
 {
 }
 
-void QCommunicationPath::registerMetaTypes() const
-{
-    QAssociation::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCommunicationPath::setPropertyData()
 {
     QAssociation::setPropertyData();
diff --git a/src/uml/qcommunicationpath.h b/src/uml/qcommunicationpath.h
index 64833e7e..4541d7b8 100644
--- a/src/uml/qcommunicationpath.h
+++ b/src/uml/qcommunicationpath.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QCommunicationPath : public QAssociation
 public:
     Q_INVOKABLE explicit QCommunicationPath(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QCommunicationPath();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcomponent.cpp b/src/uml/qcomponent.cpp
index d1c64e3c..295c439c 100644
--- a/src/uml/qcomponent.cpp
+++ b/src/uml/qcomponent.cpp
@@ -247,30 +247,6 @@ QSet<QInterface *> QComponent::usedInterfaces(const QClassifier *classifier) con
     return QSet<QInterface *>(); // change here to your derived return
 }
 
-void QComponent::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QComponentRealization *>("QComponentRealization *");
-    qRegisterMetaType<QSet<QComponentRealization *>>("QSet<QComponentRealization *>");
-    qRegisterMetaType<QList<QComponentRealization *>>("QList<QComponentRealization *>");
-
-    qRegisterMetaType<QPackageableElement *>("QPackageableElement *");
-    qRegisterMetaType<QSet<QPackageableElement *>>("QSet<QPackageableElement *>");
-    qRegisterMetaType<QList<QPackageableElement *>>("QList<QPackageableElement *>");
-
-    qRegisterMetaType<QInterface *>("QInterface *");
-    qRegisterMetaType<QSet<QInterface *>>("QSet<QInterface *>");
-    qRegisterMetaType<QList<QInterface *>>("QList<QInterface *>");
-
-    QClass::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QComponent::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QComponent")][QString::fromLatin1("isIndirectlyInstantiated")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcomponent.h b/src/uml/qcomponent.h
index dff72da1..ad04f237 100644
--- a/src/uml/qcomponent.h
+++ b/src/uml/qcomponent.h
@@ -98,7 +98,7 @@ public:
     // Operations
     Q_INVOKABLE QSet<QInterface *> realizedInterfaces(const QClassifier *classifier) const;
     Q_INVOKABLE QSet<QInterface *> usedInterfaces(const QClassifier *classifier) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcomponentrealization.cpp b/src/uml/qcomponentrealization.cpp
index d78dc536..33f43747 100644
--- a/src/uml/qcomponentrealization.cpp
+++ b/src/uml/qcomponentrealization.cpp
@@ -161,22 +161,6 @@ void QComponentRealization::removeRealizingClassifier(QClassifier *realizingClas
     }
 }
 
-void QComponentRealization::registerMetaTypes() const
-{
-    qRegisterMetaType<QComponent *>("QComponent *");
-    qRegisterMetaType<QSet<QComponent *>>("QSet<QComponent *>");
-    qRegisterMetaType<QList<QComponent *>>("QList<QComponent *>");
-
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    QRealization::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QComponentRealization::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QComponentRealization")][QString::fromLatin1("abstraction")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcomponentrealization.h b/src/uml/qcomponentrealization.h
index 29077ea5..5f7fd545 100644
--- a/src/uml/qcomponentrealization.h
+++ b/src/uml/qcomponentrealization.h
@@ -90,7 +90,7 @@ public:
     Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QComponent> abstraction);
     Q_INVOKABLE void addClient(QWrappedObjectPointer<QClassifier> realizingClassifier);
     Q_INVOKABLE void removeClient(QWrappedObjectPointer<QClassifier> realizingClassifier);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qconditionalnode.cpp b/src/uml/qconditionalnode.cpp
index 58d02c9d..0ea864b7 100644
--- a/src/uml/qconditionalnode.cpp
+++ b/src/uml/qconditionalnode.cpp
@@ -219,22 +219,6 @@ void QConditionalNode::removeResult(QOutputPin *result)
     }
 }
 
-void QConditionalNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QClause *>("QClause *");
-    qRegisterMetaType<QSet<QClause *>>("QSet<QClause *>");
-    qRegisterMetaType<QList<QClause *>>("QList<QClause *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QStructuredActivityNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QConditionalNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QConditionalNode")][QString::fromLatin1("isAssured")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qconditionalnode.h b/src/uml/qconditionalnode.h
index 8d8380ce..3adba277 100644
--- a/src/uml/qconditionalnode.h
+++ b/src/uml/qconditionalnode.h
@@ -93,7 +93,7 @@ public:
     Q_INVOKABLE QList<QOutputPin *> results() const;
     Q_INVOKABLE void addResult(QOutputPin *result);
     Q_INVOKABLE void removeResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qconnectableelement.cpp b/src/uml/qconnectableelement.cpp
index 66d3244b..ce18c254 100644
--- a/src/uml/qconnectableelement.cpp
+++ b/src/uml/qconnectableelement.cpp
@@ -312,22 +312,6 @@ void QConnectableElement::setTemplateParameter(QConnectableElementTemplateParame
     }
 }
 
-void QConnectableElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QConnectorEnd *>("QConnectorEnd *");
-    qRegisterMetaType<QSet<QConnectorEnd *>>("QSet<QConnectorEnd *>");
-    qRegisterMetaType<QList<QConnectorEnd *>>("QList<QConnectorEnd *>");
-
-    qRegisterMetaType<QConnectableElementTemplateParameter *>("QConnectableElementTemplateParameter *");
-    qRegisterMetaType<QSet<QConnectableElementTemplateParameter *>>("QSet<QConnectableElementTemplateParameter *>");
-    qRegisterMetaType<QList<QConnectableElementTemplateParameter *>>("QList<QConnectableElementTemplateParameter *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QConnectableElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElement")][QString::fromLatin1("ends")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qconnectableelement.h b/src/uml/qconnectableelement.h
index 3c4721b3..da9a238c 100644
--- a/src/uml/qconnectableelement.h
+++ b/src/uml/qconnectableelement.h
@@ -112,7 +112,7 @@ public:
     Q_INVOKABLE QList<QConnectorEnd *> ends() const;
     Q_INVOKABLE QConnectableElementTemplateParameter *templateParameter() const;
     Q_INVOKABLE void setTemplateParameter(QConnectableElementTemplateParameter *templateParameter);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qconnectableelementtemplateparameter.cpp b/src/uml/qconnectableelementtemplateparameter.cpp
index 2b74371a..05575523 100644
--- a/src/uml/qconnectableelementtemplateparameter.cpp
+++ b/src/uml/qconnectableelementtemplateparameter.cpp
@@ -111,18 +111,6 @@ void QConnectableElementTemplateParameter::setParameteredElement(QConnectableEle
     }
 }
 
-void QConnectableElementTemplateParameter::registerMetaTypes() const
-{
-    qRegisterMetaType<QConnectableElement *>("QConnectableElement *");
-    qRegisterMetaType<QSet<QConnectableElement *>>("QSet<QConnectableElement *>");
-    qRegisterMetaType<QList<QConnectableElement *>>("QList<QConnectableElement *>");
-
-    QTemplateParameter::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QConnectableElementTemplateParameter::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectableElementTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qconnectableelementtemplateparameter.h b/src/uml/qconnectableelementtemplateparameter.h
index cca42393..215488fe 100644
--- a/src/uml/qconnectableelementtemplateparameter.h
+++ b/src/uml/qconnectableelementtemplateparameter.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QConnectableElementTemplateParameter
     Q_INVOKABLE QConnectableElement *parameteredElement() const;
     Q_INVOKABLE void setParameteredElement(QConnectableElement *parameteredElement);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qconnectionpointreference.cpp b/src/uml/qconnectionpointreference.cpp
index 9443dc31..5e547c20 100644
--- a/src/uml/qconnectionpointreference.cpp
+++ b/src/uml/qconnectionpointreference.cpp
@@ -180,22 +180,6 @@ void QConnectionPointReference::removeEntry(QPseudostate *entry)
     }
 }
 
-void QConnectionPointReference::registerMetaTypes() const
-{
-    qRegisterMetaType<QPseudostate *>("QPseudostate *");
-    qRegisterMetaType<QSet<QPseudostate *>>("QSet<QPseudostate *>");
-    qRegisterMetaType<QList<QPseudostate *>>("QList<QPseudostate *>");
-
-    qRegisterMetaType<QState *>("QState *");
-    qRegisterMetaType<QSet<QState *>>("QSet<QState *>");
-    qRegisterMetaType<QList<QState *>>("QList<QState *>");
-
-    QVertex::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QConnectionPointReference::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectionPointReference")][QString::fromLatin1("exits")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qconnectionpointreference.h b/src/uml/qconnectionpointreference.h
index 0b99ab86..7d060142 100644
--- a/src/uml/qconnectionpointreference.h
+++ b/src/uml/qconnectionpointreference.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE QSet<QPseudostate *> entries() const;
     Q_INVOKABLE void addEntry(QPseudostate *entry);
     Q_INVOKABLE void removeEntry(QPseudostate *entry);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qconnector.cpp b/src/uml/qconnector.cpp
index 6ce1955f..075382ee 100644
--- a/src/uml/qconnector.cpp
+++ b/src/uml/qconnector.cpp
@@ -229,26 +229,6 @@ void QConnector::removeEnd(QConnectorEnd *end)
     }
 }
 
-void QConnector::registerMetaTypes() const
-{
-    qRegisterMetaType<QAssociation *>("QAssociation *");
-    qRegisterMetaType<QSet<QAssociation *>>("QSet<QAssociation *>");
-    qRegisterMetaType<QList<QAssociation *>>("QList<QAssociation *>");
-
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    qRegisterMetaType<QConnectorEnd *>("QConnectorEnd *");
-    qRegisterMetaType<QSet<QConnectorEnd *>>("QSet<QConnectorEnd *>");
-    qRegisterMetaType<QList<QConnectorEnd *>>("QList<QConnectorEnd *>");
-
-    QFeature::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QConnector::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QConnector")][QString::fromLatin1("kind")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qconnector.h b/src/uml/qconnector.h
index 2ce44717..c73960a0 100644
--- a/src/uml/qconnector.h
+++ b/src/uml/qconnector.h
@@ -98,7 +98,7 @@ public:
     Q_INVOKABLE QList<QConnectorEnd *> ends() const;
     Q_INVOKABLE void addEnd(QConnectorEnd *end);
     Q_INVOKABLE void removeEnd(QConnectorEnd *end);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qconnectorend.cpp b/src/uml/qconnectorend.cpp
index 71e07c18..e02e77e1 100644
--- a/src/uml/qconnectorend.cpp
+++ b/src/uml/qconnectorend.cpp
@@ -151,22 +151,6 @@ QProperty *QConnectorEnd::definingEnd() const
     return 0; // change here to your derived return
 }
 
-void QConnectorEnd::registerMetaTypes() const
-{
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QConnectableElement *>("QConnectableElement *");
-    qRegisterMetaType<QSet<QConnectableElement *>>("QSet<QConnectableElement *>");
-    qRegisterMetaType<QList<QConnectableElement *>>("QList<QConnectableElement *>");
-
-    QMultiplicityElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QConnectorEnd::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QConnectorEnd")][QString::fromLatin1("role")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qconnectorend.h b/src/uml/qconnectorend.h
index 4d77d646..5e233136 100644
--- a/src/uml/qconnectorend.h
+++ b/src/uml/qconnectorend.h
@@ -79,7 +79,7 @@ public:
     Q_INVOKABLE QProperty *partWithPort() const;
     Q_INVOKABLE void setPartWithPort(QProperty *partWithPort);
     Q_INVOKABLE QProperty *definingEnd() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qconsiderignorefragment.cpp b/src/uml/qconsiderignorefragment.cpp
index f4f84f9d..c9be4c94 100644
--- a/src/uml/qconsiderignorefragment.cpp
+++ b/src/uml/qconsiderignorefragment.cpp
@@ -115,18 +115,6 @@ void QConsiderIgnoreFragment::removeMessage(QNamedElement *message)
     }
 }
 
-void QConsiderIgnoreFragment::registerMetaTypes() const
-{
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    QCombinedFragment::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QConsiderIgnoreFragment::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QConsiderIgnoreFragment")][QString::fromLatin1("messages")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qconsiderignorefragment.h b/src/uml/qconsiderignorefragment.h
index d9bc39a7..4d51d223 100644
--- a/src/uml/qconsiderignorefragment.h
+++ b/src/uml/qconsiderignorefragment.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE QSet<QNamedElement *> messages() const;
     Q_INVOKABLE void addMessage(QNamedElement *message);
     Q_INVOKABLE void removeMessage(QNamedElement *message);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qconstraint.cpp b/src/uml/qconstraint.cpp
index 957f8a0d..dfeb859f 100644
--- a/src/uml/qconstraint.cpp
+++ b/src/uml/qconstraint.cpp
@@ -180,26 +180,6 @@ void QConstraint::removeConstrainedElement(QElement *constrainedElement)
     }
 }
 
-void QConstraint::registerMetaTypes() const
-{
-    qRegisterMetaType<QElement *>("QElement *");
-    qRegisterMetaType<QSet<QElement *>>("QSet<QElement *>");
-    qRegisterMetaType<QList<QElement *>>("QList<QElement *>");
-
-    qRegisterMetaType<QNamespace *>("QNamespace *");
-    qRegisterMetaType<QSet<QNamespace *>>("QSet<QNamespace *>");
-    qRegisterMetaType<QList<QNamespace *>>("QList<QNamespace *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QPackageableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QConstraint::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QConstraint")][QString::fromLatin1("context")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qconstraint.h b/src/uml/qconstraint.h
index 16832aa4..dcdfae5d 100644
--- a/src/uml/qconstraint.h
+++ b/src/uml/qconstraint.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE QList<QElement *> constrainedElements() const;
     Q_INVOKABLE void addConstrainedElement(QElement *constrainedElement);
     Q_INVOKABLE void removeConstrainedElement(QElement *constrainedElement);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcontinuation.cpp b/src/uml/qcontinuation.cpp
index 16f3f565..45a4dbef 100644
--- a/src/uml/qcontinuation.cpp
+++ b/src/uml/qcontinuation.cpp
@@ -112,14 +112,6 @@ void QContinuation::unsetSetting()
     d->modifiedResettableProperties.removeAll(QString::fromLatin1("setting"));
 }
 
-void QContinuation::registerMetaTypes() const
-{
-    QInteractionFragment::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QContinuation::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QContinuation")][QString::fromLatin1("setting")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcontinuation.h b/src/uml/qcontinuation.h
index 9edc54ff..93b79c5d 100644
--- a/src/uml/qcontinuation.h
+++ b/src/uml/qcontinuation.h
@@ -71,7 +71,7 @@ public:
     Q_INVOKABLE bool setting() const;
     Q_INVOKABLE void setSetting(bool setting);
     Q_INVOKABLE void unsetSetting();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcontrolflow.cpp b/src/uml/qcontrolflow.cpp
index e857adaf..2f2a4bbe 100644
--- a/src/uml/qcontrolflow.cpp
+++ b/src/uml/qcontrolflow.cpp
@@ -78,14 +78,6 @@ QControlFlow::~QControlFlow()
 {
 }
 
-void QControlFlow::registerMetaTypes() const
-{
-    QActivityEdge::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QControlFlow::setPropertyData()
 {
     QActivityEdge::setPropertyData();
diff --git a/src/uml/qcontrolflow.h b/src/uml/qcontrolflow.h
index 29744c72..d455606c 100644
--- a/src/uml/qcontrolflow.h
+++ b/src/uml/qcontrolflow.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QControlFlow : public QActivityEdge
 public:
     Q_INVOKABLE explicit QControlFlow(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QControlFlow();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcontrolnode.cpp b/src/uml/qcontrolnode.cpp
index c139ca10..97ec959c 100644
--- a/src/uml/qcontrolnode.cpp
+++ b/src/uml/qcontrolnode.cpp
@@ -78,14 +78,6 @@ QControlNode::~QControlNode()
 {
 }
 
-void QControlNode::registerMetaTypes() const
-{
-    QActivityNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QControlNode::setPropertyData()
 {
     QActivityNode::setPropertyData();
diff --git a/src/uml/qcontrolnode.h b/src/uml/qcontrolnode.h
index b50c91a9..58082cee 100644
--- a/src/uml/qcontrolnode.h
+++ b/src/uml/qcontrolnode.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QControlNode : public QActivityNode
 public:
     Q_INVOKABLE explicit QControlNode(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QControlNode();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcreatelinkaction.cpp b/src/uml/qcreatelinkaction.cpp
index 2f92c799..9d4fe3cb 100644
--- a/src/uml/qcreatelinkaction.cpp
+++ b/src/uml/qcreatelinkaction.cpp
@@ -117,18 +117,6 @@ void QCreateLinkAction::removeEndData(QLinkEndCreationData *endData)
     }
 }
 
-void QCreateLinkAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QLinkEndCreationData *>("QLinkEndCreationData *");
-    qRegisterMetaType<QSet<QLinkEndCreationData *>>("QSet<QLinkEndCreationData *>");
-    qRegisterMetaType<QList<QLinkEndCreationData *>>("QList<QLinkEndCreationData *>");
-
-    QWriteLinkAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCreateLinkAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qcreatelinkaction.h b/src/uml/qcreatelinkaction.h
index f21b64b9..f3b09a86 100644
--- a/src/uml/qcreatelinkaction.h
+++ b/src/uml/qcreatelinkaction.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE QSet<QLinkEndCreationData *> endData() const;
     Q_INVOKABLE void addEndData(QLinkEndCreationData *endData);
     Q_INVOKABLE void removeEndData(QLinkEndCreationData *endData);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcreatelinkobjectaction.cpp b/src/uml/qcreatelinkobjectaction.cpp
index 47897922..59d8b37e 100644
--- a/src/uml/qcreatelinkobjectaction.cpp
+++ b/src/uml/qcreatelinkobjectaction.cpp
@@ -114,18 +114,6 @@ void QCreateLinkObjectAction::setResult(QOutputPin *result)
     }
 }
 
-void QCreateLinkObjectAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QCreateLinkAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCreateLinkObjectAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateLinkObjectAction")][QString::fromLatin1("result")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qcreatelinkobjectaction.h b/src/uml/qcreatelinkobjectaction.h
index 21c50fba..1522bf09 100644
--- a/src/uml/qcreatelinkobjectaction.h
+++ b/src/uml/qcreatelinkobjectaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QCreateLinkObjectAction
     Q_INVOKABLE QOutputPin *result() const;
     Q_INVOKABLE void setResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qcreateobjectaction.cpp b/src/uml/qcreateobjectaction.cpp
index ccec4810..918ed936 100644
--- a/src/uml/qcreateobjectaction.cpp
+++ b/src/uml/qcreateobjectaction.cpp
@@ -137,22 +137,6 @@ void QCreateObjectAction::setResult(QOutputPin *result)
     }
 }
 
-void QCreateObjectAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QCreateObjectAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QCreateObjectAction")][QString::fromLatin1("classifier")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qcreateobjectaction.h b/src/uml/qcreateobjectaction.h
index c533fcbb..265a2c83 100644
--- a/src/uml/qcreateobjectaction.h
+++ b/src/uml/qcreateobjectaction.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setClassifier(QClassifier *classifier);
     Q_INVOKABLE QOutputPin *result() const;
     Q_INVOKABLE void setResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdatastorenode.cpp b/src/uml/qdatastorenode.cpp
index f3602fc8..b66736a3 100644
--- a/src/uml/qdatastorenode.cpp
+++ b/src/uml/qdatastorenode.cpp
@@ -78,14 +78,6 @@ QDataStoreNode::~QDataStoreNode()
 {
 }
 
-void QDataStoreNode::registerMetaTypes() const
-{
-    QCentralBufferNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDataStoreNode::setPropertyData()
 {
     QCentralBufferNode::setPropertyData();
diff --git a/src/uml/qdatastorenode.h b/src/uml/qdatastorenode.h
index f1a4ca8f..1a07ce30 100644
--- a/src/uml/qdatastorenode.h
+++ b/src/uml/qdatastorenode.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QDataStoreNode : public QCentralBufferNode
 public:
     Q_INVOKABLE explicit QDataStoreNode(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QDataStoreNode();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdatatype.cpp b/src/uml/qdatatype.cpp
index 7c9881af..03b0dea4 100644
--- a/src/uml/qdatatype.cpp
+++ b/src/uml/qdatatype.cpp
@@ -187,26 +187,6 @@ QSet<QNamedElement *> QDataType::inherit(QSet<QNamedElement *> inhs) const
     return QSet<QNamedElement *>(); // change here to your derived return
 }
 
-void QDataType::registerMetaTypes() const
-{
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    QClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDataType::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDataType")][QString::fromLatin1("ownedOperations")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qdatatype.h b/src/uml/qdatatype.h
index 65b985da..24c12cda 100644
--- a/src/uml/qdatatype.h
+++ b/src/uml/qdatatype.h
@@ -87,7 +87,7 @@ public:
 
     // Operations
     Q_INVOKABLE QSet<QNamedElement *> inherit(QSet<QNamedElement *> inhs) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdecisionnode.cpp b/src/uml/qdecisionnode.cpp
index 933bba4b..ac8d37e1 100644
--- a/src/uml/qdecisionnode.cpp
+++ b/src/uml/qdecisionnode.cpp
@@ -129,22 +129,6 @@ void QDecisionNode::setDecisionInput(QBehavior *decisionInput)
     }
 }
 
-void QDecisionNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    qRegisterMetaType<QObjectFlow *>("QObjectFlow *");
-    qRegisterMetaType<QSet<QObjectFlow *>>("QSet<QObjectFlow *>");
-    qRegisterMetaType<QList<QObjectFlow *>>("QList<QObjectFlow *>");
-
-    QControlNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDecisionNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDecisionNode")][QString::fromLatin1("decisionInputFlow")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qdecisionnode.h b/src/uml/qdecisionnode.h
index e784faa5..2d45be8c 100644
--- a/src/uml/qdecisionnode.h
+++ b/src/uml/qdecisionnode.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setDecisionInputFlow(QObjectFlow *decisionInputFlow);
     Q_INVOKABLE QBehavior *decisionInput() const;
     Q_INVOKABLE void setDecisionInput(QBehavior *decisionInput);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdependency.cpp b/src/uml/qdependency.cpp
index 73195882..589e15c7 100644
--- a/src/uml/qdependency.cpp
+++ b/src/uml/qdependency.cpp
@@ -361,18 +361,6 @@ void QDependency::removeSupplier(QNamedElement *supplier)
     }
 }
 
-void QDependency::registerMetaTypes() const
-{
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDependency::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDependency")][QString::fromLatin1("clients")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qdependency.h b/src/uml/qdependency.h
index ec698ecf..a1579ee7 100644
--- a/src/uml/qdependency.h
+++ b/src/uml/qdependency.h
@@ -122,7 +122,7 @@ public:
     Q_INVOKABLE QSet<QNamedElement *> suppliers() const;
     Q_INVOKABLE void addSupplier(QNamedElement *supplier);
     Q_INVOKABLE void removeSupplier(QNamedElement *supplier);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdeployedartifact.cpp b/src/uml/qdeployedartifact.cpp
index 827684f1..24584ea1 100644
--- a/src/uml/qdeployedartifact.cpp
+++ b/src/uml/qdeployedartifact.cpp
@@ -78,14 +78,6 @@ QDeployedArtifact::~QDeployedArtifact()
 {
 }
 
-void QDeployedArtifact::registerMetaTypes() const
-{
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDeployedArtifact::setPropertyData()
 {
     QNamedElement::setPropertyData();
diff --git a/src/uml/qdeployedartifact.h b/src/uml/qdeployedartifact.h
index 3f44708a..a676c188 100644
--- a/src/uml/qdeployedartifact.h
+++ b/src/uml/qdeployedartifact.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QDeployedArtifact : public QNamedElement
 public:
     Q_INVOKABLE explicit QDeployedArtifact(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QDeployedArtifact();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdeployment.cpp b/src/uml/qdeployment.cpp
index eed9dfd7..f281c3a6 100644
--- a/src/uml/qdeployment.cpp
+++ b/src/uml/qdeployment.cpp
@@ -205,26 +205,6 @@ void QDeployment::removeDeployedArtifact(QDeployedArtifact *deployedArtifact)
     }
 }
 
-void QDeployment::registerMetaTypes() const
-{
-    qRegisterMetaType<QDeploymentSpecification *>("QDeploymentSpecification *");
-    qRegisterMetaType<QSet<QDeploymentSpecification *>>("QSet<QDeploymentSpecification *>");
-    qRegisterMetaType<QList<QDeploymentSpecification *>>("QList<QDeploymentSpecification *>");
-
-    qRegisterMetaType<QDeployedArtifact *>("QDeployedArtifact *");
-    qRegisterMetaType<QSet<QDeployedArtifact *>>("QSet<QDeployedArtifact *>");
-    qRegisterMetaType<QList<QDeployedArtifact *>>("QList<QDeployedArtifact *>");
-
-    qRegisterMetaType<QDeploymentTarget *>("QDeploymentTarget *");
-    qRegisterMetaType<QSet<QDeploymentTarget *>>("QSet<QDeploymentTarget *>");
-    qRegisterMetaType<QList<QDeploymentTarget *>>("QList<QDeploymentTarget *>");
-
-    QDependency::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDeployment::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDeployment")][QString::fromLatin1("location")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qdeployment.h b/src/uml/qdeployment.h
index 88268b07..d99e77bd 100644
--- a/src/uml/qdeployment.h
+++ b/src/uml/qdeployment.h
@@ -95,7 +95,7 @@ public:
     Q_INVOKABLE void removeClient(QWrappedObjectPointer<QDeploymentTarget> location);
     Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QDeployedArtifact> deployedArtifact);
     Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QDeployedArtifact> deployedArtifact);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdeploymentspecification.cpp b/src/uml/qdeploymentspecification.cpp
index e2de507d..4e3a2ee3 100644
--- a/src/uml/qdeploymentspecification.cpp
+++ b/src/uml/qdeploymentspecification.cpp
@@ -163,18 +163,6 @@ void QDeploymentSpecification::setDeployment(QDeployment *deployment)
     }
 }
 
-void QDeploymentSpecification::registerMetaTypes() const
-{
-    qRegisterMetaType<QDeployment *>("QDeployment *");
-    qRegisterMetaType<QSet<QDeployment *>>("QSet<QDeployment *>");
-    qRegisterMetaType<QList<QDeployment *>>("QList<QDeployment *>");
-
-    QArtifact::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDeploymentSpecification::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentSpecification")][QString::fromLatin1("deploymentLocation")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qdeploymentspecification.h b/src/uml/qdeploymentspecification.h
index c71328ac..3521dbd6 100644
--- a/src/uml/qdeploymentspecification.h
+++ b/src/uml/qdeploymentspecification.h
@@ -84,7 +84,7 @@ public:
     // Association ends from QDeploymentSpecification
     Q_INVOKABLE QDeployment *deployment() const;
     Q_INVOKABLE void setDeployment(QDeployment *deployment);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdeploymenttarget.cpp b/src/uml/qdeploymenttarget.cpp
index 1105b249..0edaa2de 100644
--- a/src/uml/qdeploymenttarget.cpp
+++ b/src/uml/qdeploymenttarget.cpp
@@ -142,22 +142,6 @@ void QDeploymentTarget::removeDeployment(QDeployment *deployment)
     }
 }
 
-void QDeploymentTarget::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackageableElement *>("QPackageableElement *");
-    qRegisterMetaType<QSet<QPackageableElement *>>("QSet<QPackageableElement *>");
-    qRegisterMetaType<QList<QPackageableElement *>>("QList<QPackageableElement *>");
-
-    qRegisterMetaType<QDeployment *>("QDeployment *");
-    qRegisterMetaType<QSet<QDeployment *>>("QSet<QDeployment *>");
-    qRegisterMetaType<QList<QDeployment *>>("QList<QDeployment *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDeploymentTarget::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDeploymentTarget")][QString::fromLatin1("deployedElements")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qdeploymenttarget.h b/src/uml/qdeploymenttarget.h
index fb1516b1..9e1d0b04 100644
--- a/src/uml/qdeploymenttarget.h
+++ b/src/uml/qdeploymenttarget.h
@@ -87,7 +87,7 @@ public:
     // Overriden methods for subsetted properties
     Q_INVOKABLE void addClientDependency(QWrappedObjectPointer<QDeployment> deployment);
     Q_INVOKABLE void removeClientDependency(QWrappedObjectPointer<QDeployment> deployment);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdestroylinkaction.cpp b/src/uml/qdestroylinkaction.cpp
index 7e439b03..6e724ba2 100644
--- a/src/uml/qdestroylinkaction.cpp
+++ b/src/uml/qdestroylinkaction.cpp
@@ -117,18 +117,6 @@ void QDestroyLinkAction::removeEndData(QLinkEndDestructionData *endData)
     }
 }
 
-void QDestroyLinkAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QLinkEndDestructionData *>("QLinkEndDestructionData *");
-    qRegisterMetaType<QSet<QLinkEndDestructionData *>>("QSet<QLinkEndDestructionData *>");
-    qRegisterMetaType<QList<QLinkEndDestructionData *>>("QList<QLinkEndDestructionData *>");
-
-    QWriteLinkAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDestroyLinkAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyLinkAction")][QString::fromLatin1("endData")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qdestroylinkaction.h b/src/uml/qdestroylinkaction.h
index a9aed0be..97cb2d24 100644
--- a/src/uml/qdestroylinkaction.h
+++ b/src/uml/qdestroylinkaction.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE QSet<QLinkEndDestructionData *> endData() const;
     Q_INVOKABLE void addEndData(QLinkEndDestructionData *endData);
     Q_INVOKABLE void removeEndData(QLinkEndDestructionData *endData);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdestroyobjectaction.cpp b/src/uml/qdestroyobjectaction.cpp
index e5569615..2bbc2387 100644
--- a/src/uml/qdestroyobjectaction.cpp
+++ b/src/uml/qdestroyobjectaction.cpp
@@ -178,18 +178,6 @@ void QDestroyObjectAction::setTarget(QInputPin *target)
     }
 }
 
-void QDestroyObjectAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDestroyObjectAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDestroyObjectAction")][QString::fromLatin1("isDestroyLinks")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qdestroyobjectaction.h b/src/uml/qdestroyobjectaction.h
index 133d4a31..4148c567 100644
--- a/src/uml/qdestroyobjectaction.h
+++ b/src/uml/qdestroyobjectaction.h
@@ -83,7 +83,7 @@ public:
     // Association ends from QDestroyObjectAction
     Q_INVOKABLE QInputPin *target() const;
     Q_INVOKABLE void setTarget(QInputPin *target);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdestructionoccurrencespecification.cpp b/src/uml/qdestructionoccurrencespecification.cpp
index d140e6e6..0010c668 100644
--- a/src/uml/qdestructionoccurrencespecification.cpp
+++ b/src/uml/qdestructionoccurrencespecification.cpp
@@ -78,14 +78,6 @@ QDestructionOccurrenceSpecification::~QDestructionOccurrenceSpecification()
 {
 }
 
-void QDestructionOccurrenceSpecification::registerMetaTypes() const
-{
-    QMessageOccurrenceSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDestructionOccurrenceSpecification::setPropertyData()
 {
     QMessageOccurrenceSpecification::setPropertyData();
diff --git a/src/uml/qdestructionoccurrencespecification.h b/src/uml/qdestructionoccurrencespecification.h
index fd42eaf6..2d57c57f 100644
--- a/src/uml/qdestructionoccurrencespecification.h
+++ b/src/uml/qdestructionoccurrencespecification.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QDestructionOccurrenceSpecification : public QMessageOccurren
 public:
     Q_INVOKABLE explicit QDestructionOccurrenceSpecification(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QDestructionOccurrenceSpecification();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdevice.cpp b/src/uml/qdevice.cpp
index b6d8f64d..99572bc8 100644
--- a/src/uml/qdevice.cpp
+++ b/src/uml/qdevice.cpp
@@ -78,14 +78,6 @@ QDevice::~QDevice()
 {
 }
 
-void QDevice::registerMetaTypes() const
-{
-    QNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDevice::setPropertyData()
 {
     QNode::setPropertyData();
diff --git a/src/uml/qdevice.h b/src/uml/qdevice.h
index 90cb83f5..48440897 100644
--- a/src/uml/qdevice.h
+++ b/src/uml/qdevice.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QDevice : public QNode
 public:
     Q_INVOKABLE explicit QDevice(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QDevice();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdirectedrelationship.cpp b/src/uml/qdirectedrelationship.cpp
index cac0f104..cee608ab 100644
--- a/src/uml/qdirectedrelationship.cpp
+++ b/src/uml/qdirectedrelationship.cpp
@@ -154,18 +154,6 @@ QSet<QElement *> QDirectedRelationship::targets() const
     return d->targets;
 }
 
-void QDirectedRelationship::registerMetaTypes() const
-{
-    qRegisterMetaType<QElement *>("QElement *");
-    qRegisterMetaType<QSet<QElement *>>("QSet<QElement *>");
-    qRegisterMetaType<QList<QElement *>>("QList<QElement *>");
-
-    QRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDirectedRelationship::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDirectedRelationship")][QString::fromLatin1("sources")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qdirectedrelationship.h b/src/uml/qdirectedrelationship.h
index b81e15b6..77c803cd 100644
--- a/src/uml/qdirectedrelationship.h
+++ b/src/uml/qdirectedrelationship.h
@@ -77,7 +77,7 @@ public:
     // Association ends from QDirectedRelationship
     Q_INVOKABLE QSet<QElement *> sources() const;
     Q_INVOKABLE QSet<QElement *> targets() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qduration.cpp b/src/uml/qduration.cpp
index e1f4f4e1..91dccab6 100644
--- a/src/uml/qduration.cpp
+++ b/src/uml/qduration.cpp
@@ -145,18 +145,6 @@ void QDuration::removeObservation(QObservation *observation)
     }
 }
 
-void QDuration::registerMetaTypes() const
-{
-    qRegisterMetaType<QObservation *>("QObservation *");
-    qRegisterMetaType<QSet<QObservation *>>("QSet<QObservation *>");
-    qRegisterMetaType<QList<QObservation *>>("QList<QObservation *>");
-
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDuration::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDuration")][QString::fromLatin1("expr")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qduration.h b/src/uml/qduration.h
index 482ef9d2..7ac0415d 100644
--- a/src/uml/qduration.h
+++ b/src/uml/qduration.h
@@ -80,7 +80,7 @@ public:
     Q_INVOKABLE QSet<QObservation *> observations() const;
     Q_INVOKABLE void addObservation(QObservation *observation);
     Q_INVOKABLE void removeObservation(QObservation *observation);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdurationconstraint.cpp b/src/uml/qdurationconstraint.cpp
index ae23bcb1..8363373d 100644
--- a/src/uml/qdurationconstraint.cpp
+++ b/src/uml/qdurationconstraint.cpp
@@ -144,18 +144,6 @@ void QDurationConstraint::setSpecification(QDurationInterval *specification)
     }
 }
 
-void QDurationConstraint::registerMetaTypes() const
-{
-    qRegisterMetaType<QDurationInterval *>("QDurationInterval *");
-    qRegisterMetaType<QSet<QDurationInterval *>>("QSet<QDurationInterval *>");
-    qRegisterMetaType<QList<QDurationInterval *>>("QList<QDurationInterval *>");
-
-    QIntervalConstraint::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDurationConstraint::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationConstraint")][QString::fromLatin1("firstEvents")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qdurationconstraint.h b/src/uml/qdurationconstraint.h
index 258e4a2e..af33fa70 100644
--- a/src/uml/qdurationconstraint.h
+++ b/src/uml/qdurationconstraint.h
@@ -82,7 +82,7 @@ public:
     // Association ends from QDurationConstraint
     Q_INVOKABLE QDurationInterval *specification() const;
     Q_INVOKABLE void setSpecification(QDurationInterval *specification);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdurationinterval.cpp b/src/uml/qdurationinterval.cpp
index ed9eb529..ea514340 100644
--- a/src/uml/qdurationinterval.cpp
+++ b/src/uml/qdurationinterval.cpp
@@ -128,18 +128,6 @@ void QDurationInterval::setMin(QDuration *min)
     }
 }
 
-void QDurationInterval::registerMetaTypes() const
-{
-    qRegisterMetaType<QDuration *>("QDuration *");
-    qRegisterMetaType<QSet<QDuration *>>("QSet<QDuration *>");
-    qRegisterMetaType<QList<QDuration *>>("QList<QDuration *>");
-
-    QInterval::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDurationInterval::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationInterval")][QString::fromLatin1("max")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qdurationinterval.h b/src/uml/qdurationinterval.h
index bfca2d3a..400232bc 100644
--- a/src/uml/qdurationinterval.h
+++ b/src/uml/qdurationinterval.h
@@ -76,7 +76,7 @@ public:
     Q_INVOKABLE void setMax(QDuration *max);
     Q_INVOKABLE QDuration *min() const;
     Q_INVOKABLE void setMin(QDuration *min);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qdurationobservation.cpp b/src/uml/qdurationobservation.cpp
index 135d260e..de77161f 100644
--- a/src/uml/qdurationobservation.cpp
+++ b/src/uml/qdurationobservation.cpp
@@ -150,18 +150,6 @@ void QDurationObservation::removeEvent(QNamedElement *event)
     }
 }
 
-void QDurationObservation::registerMetaTypes() const
-{
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    QObservation::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QDurationObservation::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QDurationObservation")][QString::fromLatin1("firstEvents")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qdurationobservation.h b/src/uml/qdurationobservation.h
index f1753743..25915dc2 100644
--- a/src/uml/qdurationobservation.h
+++ b/src/uml/qdurationobservation.h
@@ -83,7 +83,7 @@ public:
     Q_INVOKABLE QSet<QNamedElement *> events() const;
     Q_INVOKABLE void addEvent(QNamedElement *event);
     Q_INVOKABLE void removeEvent(QNamedElement *event);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qelement.cpp b/src/uml/qelement.cpp
index 81bbd13b..78f6a598 100644
--- a/src/uml/qelement.cpp
+++ b/src/uml/qelement.cpp
@@ -207,18 +207,6 @@ bool QElement::mustBeOwned() const
     return true;
 }
 
-void QElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QComment *>("QComment *");
-    qRegisterMetaType<QSet<QComment *>>("QSet<QComment *>");
-    qRegisterMetaType<QList<QComment *>>("QList<QComment *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QElement")][QString::fromLatin1("ownedElements")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qelement.h b/src/uml/qelement.h
index e046dd2c..e6230987 100644
--- a/src/uml/qelement.h
+++ b/src/uml/qelement.h
@@ -86,7 +86,7 @@ public:
     // Operations
     Q_INVOKABLE QSet<QElement *> allOwnedElements() const;
     Q_INVOKABLE bool mustBeOwned() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qelementimport.cpp b/src/uml/qelementimport.cpp
index 4c754041..d3022323 100644
--- a/src/uml/qelementimport.cpp
+++ b/src/uml/qelementimport.cpp
@@ -219,22 +219,6 @@ QString QElementImport::getName() const
     return QString(); // change here to your derived return
 }
 
-void QElementImport::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackageableElement *>("QPackageableElement *");
-    qRegisterMetaType<QSet<QPackageableElement *>>("QSet<QPackageableElement *>");
-    qRegisterMetaType<QList<QPackageableElement *>>("QList<QPackageableElement *>");
-
-    qRegisterMetaType<QNamespace *>("QNamespace *");
-    qRegisterMetaType<QSet<QNamespace *>>("QSet<QNamespace *>");
-    qRegisterMetaType<QList<QNamespace *>>("QList<QNamespace *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QElementImport::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QElementImport")][QString::fromLatin1("alias")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qelementimport.h b/src/uml/qelementimport.h
index 8be4611a..73b20856 100644
--- a/src/uml/qelementimport.h
+++ b/src/uml/qelementimport.h
@@ -95,7 +95,7 @@ public:
 
     // Operations
     Q_INVOKABLE QString getName() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qencapsulatedclassifier.cpp b/src/uml/qencapsulatedclassifier.cpp
index 6f289e81..3cfe903c 100644
--- a/src/uml/qencapsulatedclassifier.cpp
+++ b/src/uml/qencapsulatedclassifier.cpp
@@ -96,18 +96,6 @@ QSet<QPort *> QEncapsulatedClassifier::ownedPorts() const
     return QSet<QPort *>(); // change here to your derived return
 }
 
-void QEncapsulatedClassifier::registerMetaTypes() const
-{
-    qRegisterMetaType<QPort *>("QPort *");
-    qRegisterMetaType<QSet<QPort *>>("QSet<QPort *>");
-    qRegisterMetaType<QList<QPort *>>("QList<QPort *>");
-
-    QStructuredClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QEncapsulatedClassifier::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QEncapsulatedClassifier")][QString::fromLatin1("ownedPorts")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qencapsulatedclassifier.h b/src/uml/qencapsulatedclassifier.h
index 421126a6..302e87d1 100644
--- a/src/uml/qencapsulatedclassifier.h
+++ b/src/uml/qencapsulatedclassifier.h
@@ -75,7 +75,7 @@ public:
 
     // Association ends from QEncapsulatedClassifier
     Q_INVOKABLE QSet<QPort *> ownedPorts() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qenumeration.cpp b/src/uml/qenumeration.cpp
index e214eac4..4a2ab47a 100644
--- a/src/uml/qenumeration.cpp
+++ b/src/uml/qenumeration.cpp
@@ -127,18 +127,6 @@ void QEnumeration::removeOwnedLiteral(QEnumerationLiteral *ownedLiteral)
     }
 }
 
-void QEnumeration::registerMetaTypes() const
-{
-    qRegisterMetaType<QEnumerationLiteral *>("QEnumerationLiteral *");
-    qRegisterMetaType<QSet<QEnumerationLiteral *>>("QSet<QEnumerationLiteral *>");
-    qRegisterMetaType<QList<QEnumerationLiteral *>>("QList<QEnumerationLiteral *>");
-
-    QDataType::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QEnumeration::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumeration")][QString::fromLatin1("ownedLiterals")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qenumeration.h b/src/uml/qenumeration.h
index bbc1ced6..3cde14b2 100644
--- a/src/uml/qenumeration.h
+++ b/src/uml/qenumeration.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE QList<QEnumerationLiteral *> ownedLiterals() const;
     Q_INVOKABLE void addOwnedLiteral(QEnumerationLiteral *ownedLiteral);
     Q_INVOKABLE void removeOwnedLiteral(QEnumerationLiteral *ownedLiteral);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qenumerationliteral.cpp b/src/uml/qenumerationliteral.cpp
index 7e7ecec5..2b00ded2 100644
--- a/src/uml/qenumerationliteral.cpp
+++ b/src/uml/qenumerationliteral.cpp
@@ -129,18 +129,6 @@ void QEnumerationLiteral::setEnumeration(QEnumeration *enumeration)
     }
 }
 
-void QEnumerationLiteral::registerMetaTypes() const
-{
-    qRegisterMetaType<QEnumeration *>("QEnumeration *");
-    qRegisterMetaType<QSet<QEnumeration *>>("QSet<QEnumeration *>");
-    qRegisterMetaType<QList<QEnumeration *>>("QList<QEnumeration *>");
-
-    QInstanceSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QEnumerationLiteral::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QEnumerationLiteral")][QString::fromLatin1("classifier")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qenumerationliteral.h b/src/uml/qenumerationliteral.h
index 17fceea4..80b76768 100644
--- a/src/uml/qenumerationliteral.h
+++ b/src/uml/qenumerationliteral.h
@@ -75,7 +75,7 @@ public:
     Q_INVOKABLE QEnumeration *classifier() const;
     Q_INVOKABLE QEnumeration *enumeration() const;
     Q_INVOKABLE void setEnumeration(QEnumeration *enumeration);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qevent.cpp b/src/uml/qevent.cpp
index 7a790733..1178c947 100644
--- a/src/uml/qevent.cpp
+++ b/src/uml/qevent.cpp
@@ -78,14 +78,6 @@ QEvent::~QEvent()
 {
 }
 
-void QEvent::registerMetaTypes() const
-{
-    QPackageableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QEvent::setPropertyData()
 {
     QPackageableElement::setPropertyData();
diff --git a/src/uml/qevent.h b/src/uml/qevent.h
index 84f56e34..30e1eb44 100644
--- a/src/uml/qevent.h
+++ b/src/uml/qevent.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QEvent : public QPackageableElement
 public:
     Q_INVOKABLE explicit QEvent(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QEvent();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qexceptionhandler.cpp b/src/uml/qexceptionhandler.cpp
index f1d843d6..7d7df614 100644
--- a/src/uml/qexceptionhandler.cpp
+++ b/src/uml/qexceptionhandler.cpp
@@ -194,26 +194,6 @@ void QExceptionHandler::setExceptionInput(QObjectNode *exceptionInput)
     }
 }
 
-void QExceptionHandler::registerMetaTypes() const
-{
-    qRegisterMetaType<QObjectNode *>("QObjectNode *");
-    qRegisterMetaType<QSet<QObjectNode *>>("QSet<QObjectNode *>");
-    qRegisterMetaType<QList<QObjectNode *>>("QList<QObjectNode *>");
-
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QExecutableNode *>("QExecutableNode *");
-    qRegisterMetaType<QSet<QExecutableNode *>>("QSet<QExecutableNode *>");
-    qRegisterMetaType<QList<QExecutableNode *>>("QList<QExecutableNode *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExceptionHandler::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExceptionHandler")][QString::fromLatin1("handlerBody")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qexceptionhandler.h b/src/uml/qexceptionhandler.h
index 38305644..810a49e9 100644
--- a/src/uml/qexceptionhandler.h
+++ b/src/uml/qexceptionhandler.h
@@ -88,7 +88,7 @@ public:
     Q_INVOKABLE void setProtectedNode(QExecutableNode *protectedNode);
     Q_INVOKABLE QObjectNode *exceptionInput() const;
     Q_INVOKABLE void setExceptionInput(QObjectNode *exceptionInput);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qexecutablenode.cpp b/src/uml/qexecutablenode.cpp
index ee6e485c..7271e632 100644
--- a/src/uml/qexecutablenode.cpp
+++ b/src/uml/qexecutablenode.cpp
@@ -127,18 +127,6 @@ void QExecutableNode::removeHandler(QExceptionHandler *handler)
     }
 }
 
-void QExecutableNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QExceptionHandler *>("QExceptionHandler *");
-    qRegisterMetaType<QSet<QExceptionHandler *>>("QSet<QExceptionHandler *>");
-    qRegisterMetaType<QList<QExceptionHandler *>>("QList<QExceptionHandler *>");
-
-    QActivityNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExecutableNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutableNode")][QString::fromLatin1("handlers")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qexecutablenode.h b/src/uml/qexecutablenode.h
index 6861ed44..18c2ac5c 100644
--- a/src/uml/qexecutablenode.h
+++ b/src/uml/qexecutablenode.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE QSet<QExceptionHandler *> handlers() const;
     Q_INVOKABLE void addHandler(QExceptionHandler *handler);
     Q_INVOKABLE void removeHandler(QExceptionHandler *handler);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qexecutionenvironment.cpp b/src/uml/qexecutionenvironment.cpp
index 5b783e71..3a6d0ab7 100644
--- a/src/uml/qexecutionenvironment.cpp
+++ b/src/uml/qexecutionenvironment.cpp
@@ -78,14 +78,6 @@ QExecutionEnvironment::~QExecutionEnvironment()
 {
 }
 
-void QExecutionEnvironment::registerMetaTypes() const
-{
-    QNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExecutionEnvironment::setPropertyData()
 {
     QNode::setPropertyData();
diff --git a/src/uml/qexecutionenvironment.h b/src/uml/qexecutionenvironment.h
index 83b29368..38c65d8d 100644
--- a/src/uml/qexecutionenvironment.h
+++ b/src/uml/qexecutionenvironment.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QExecutionEnvironment : public QNode
 public:
     Q_INVOKABLE explicit QExecutionEnvironment(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QExecutionEnvironment();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qexecutionoccurrencespecification.cpp b/src/uml/qexecutionoccurrencespecification.cpp
index 5dfc8359..ca31e963 100644
--- a/src/uml/qexecutionoccurrencespecification.cpp
+++ b/src/uml/qexecutionoccurrencespecification.cpp
@@ -106,18 +106,6 @@ void QExecutionOccurrenceSpecification::setExecution(QExecutionSpecification *ex
     }
 }
 
-void QExecutionOccurrenceSpecification::registerMetaTypes() const
-{
-    qRegisterMetaType<QExecutionSpecification *>("QExecutionSpecification *");
-    qRegisterMetaType<QSet<QExecutionSpecification *>>("QSet<QExecutionSpecification *>");
-    qRegisterMetaType<QList<QExecutionSpecification *>>("QList<QExecutionSpecification *>");
-
-    QOccurrenceSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExecutionOccurrenceSpecification::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionOccurrenceSpecification")][QString::fromLatin1("execution")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qexecutionoccurrencespecification.h b/src/uml/qexecutionoccurrencespecification.h
index e06b3ceb..838ea672 100644
--- a/src/uml/qexecutionoccurrencespecification.h
+++ b/src/uml/qexecutionoccurrencespecification.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QExecutionOccurrenceSpecification
     Q_INVOKABLE QExecutionSpecification *execution() const;
     Q_INVOKABLE void setExecution(QExecutionSpecification *execution);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qexecutionspecification.cpp b/src/uml/qexecutionspecification.cpp
index 1740079d..b54733c0 100644
--- a/src/uml/qexecutionspecification.cpp
+++ b/src/uml/qexecutionspecification.cpp
@@ -128,18 +128,6 @@ void QExecutionSpecification::setFinish(QOccurrenceSpecification *finish)
     }
 }
 
-void QExecutionSpecification::registerMetaTypes() const
-{
-    qRegisterMetaType<QOccurrenceSpecification *>("QOccurrenceSpecification *");
-    qRegisterMetaType<QSet<QOccurrenceSpecification *>>("QSet<QOccurrenceSpecification *>");
-    qRegisterMetaType<QList<QOccurrenceSpecification *>>("QList<QOccurrenceSpecification *>");
-
-    QInteractionFragment::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExecutionSpecification::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExecutionSpecification")][QString::fromLatin1("start")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qexecutionspecification.h b/src/uml/qexecutionspecification.h
index 0565aea4..9715686b 100644
--- a/src/uml/qexecutionspecification.h
+++ b/src/uml/qexecutionspecification.h
@@ -76,7 +76,7 @@ public:
     Q_INVOKABLE void setStart(QOccurrenceSpecification *start);
     Q_INVOKABLE QOccurrenceSpecification *finish() const;
     Q_INVOKABLE void setFinish(QOccurrenceSpecification *finish);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qexpansionnode.cpp b/src/uml/qexpansionnode.cpp
index 2486de08..257c1beb 100644
--- a/src/uml/qexpansionnode.cpp
+++ b/src/uml/qexpansionnode.cpp
@@ -144,18 +144,6 @@ void QExpansionNode::setRegionAsInput(QExpansionRegion *regionAsInput)
     }
 }
 
-void QExpansionNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QExpansionRegion *>("QExpansionRegion *");
-    qRegisterMetaType<QSet<QExpansionRegion *>>("QSet<QExpansionRegion *>");
-    qRegisterMetaType<QList<QExpansionRegion *>>("QList<QExpansionRegion *>");
-
-    QObjectNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExpansionNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionNode")][QString::fromLatin1("regionAsOutput")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qexpansionnode.h b/src/uml/qexpansionnode.h
index 4f3e4908..ead5f5c3 100644
--- a/src/uml/qexpansionnode.h
+++ b/src/uml/qexpansionnode.h
@@ -76,7 +76,7 @@ public:
     Q_INVOKABLE void setRegionAsOutput(QExpansionRegion *regionAsOutput);
     Q_INVOKABLE QExpansionRegion *regionAsInput() const;
     Q_INVOKABLE void setRegionAsInput(QExpansionRegion *regionAsInput);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qexpansionregion.cpp b/src/uml/qexpansionregion.cpp
index f629936b..6854284d 100644
--- a/src/uml/qexpansionregion.cpp
+++ b/src/uml/qexpansionregion.cpp
@@ -192,18 +192,6 @@ void QExpansionRegion::removeOutputElement(QExpansionNode *outputElement)
     }
 }
 
-void QExpansionRegion::registerMetaTypes() const
-{
-    qRegisterMetaType<QExpansionNode *>("QExpansionNode *");
-    qRegisterMetaType<QSet<QExpansionNode *>>("QSet<QExpansionNode *>");
-    qRegisterMetaType<QList<QExpansionNode *>>("QList<QExpansionNode *>");
-
-    QStructuredActivityNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExpansionRegion::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExpansionRegion")][QString::fromLatin1("mode")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qexpansionregion.h b/src/uml/qexpansionregion.h
index 09a4aeb1..e4225bcd 100644
--- a/src/uml/qexpansionregion.h
+++ b/src/uml/qexpansionregion.h
@@ -90,7 +90,7 @@ public:
     Q_INVOKABLE QSet<QExpansionNode *> outputElements() const;
     Q_INVOKABLE void addOutputElement(QExpansionNode *outputElement);
     Q_INVOKABLE void removeOutputElement(QExpansionNode *outputElement);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qexpression.cpp b/src/uml/qexpression.cpp
index f5850b28..01620924 100644
--- a/src/uml/qexpression.cpp
+++ b/src/uml/qexpression.cpp
@@ -144,14 +144,6 @@ void QExpression::removeOperand(QValueSpecification *operand)
     }
 }
 
-void QExpression::registerMetaTypes() const
-{
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExpression::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExpression")][QString::fromLatin1("symbol")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qexpression.h b/src/uml/qexpression.h
index f35e20e3..b1f59b21 100644
--- a/src/uml/qexpression.h
+++ b/src/uml/qexpression.h
@@ -80,7 +80,7 @@ public:
     Q_INVOKABLE QList<QValueSpecification *> operands() const;
     Q_INVOKABLE void addOperand(QValueSpecification *operand);
     Q_INVOKABLE void removeOperand(QValueSpecification *operand);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qextend.cpp b/src/uml/qextend.cpp
index 3a6cd127..8d907d90 100644
--- a/src/uml/qextend.cpp
+++ b/src/uml/qextend.cpp
@@ -371,26 +371,6 @@ void QExtend::setCondition(QConstraint *condition)
     }
 }
 
-void QExtend::registerMetaTypes() const
-{
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QUseCase *>("QUseCase *");
-    qRegisterMetaType<QSet<QUseCase *>>("QSet<QUseCase *>");
-    qRegisterMetaType<QList<QUseCase *>>("QList<QUseCase *>");
-
-    qRegisterMetaType<QExtensionPoint *>("QExtensionPoint *");
-    qRegisterMetaType<QSet<QExtensionPoint *>>("QSet<QExtensionPoint *>");
-    qRegisterMetaType<QList<QExtensionPoint *>>("QList<QExtensionPoint *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExtend::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExtend")][QString::fromLatin1("extendedCase")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qextend.h b/src/uml/qextend.h
index 913c236b..6d20669c 100644
--- a/src/uml/qextend.h
+++ b/src/uml/qextend.h
@@ -120,7 +120,7 @@ public:
     Q_INVOKABLE void removeExtensionLocation(QExtensionPoint *extensionLocation);
     Q_INVOKABLE QConstraint *condition() const;
     Q_INVOKABLE void setCondition(QConstraint *condition);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qextension.cpp b/src/uml/qextension.cpp
index 409fc5b5..64b5d224 100644
--- a/src/uml/qextension.cpp
+++ b/src/uml/qextension.cpp
@@ -172,26 +172,6 @@ QProperty *QExtension::metaclassEnd() const
     return 0; // change here to your derived return
 }
 
-void QExtension::registerMetaTypes() const
-{
-    qRegisterMetaType<QClass *>("QClass *");
-    qRegisterMetaType<QSet<QClass *>>("QSet<QClass *>");
-    qRegisterMetaType<QList<QClass *>>("QList<QClass *>");
-
-    qRegisterMetaType<QExtensionEnd *>("QExtensionEnd *");
-    qRegisterMetaType<QSet<QExtensionEnd *>>("QSet<QExtensionEnd *>");
-    qRegisterMetaType<QList<QExtensionEnd *>>("QList<QExtensionEnd *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    QAssociation::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExtension::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExtension")][QString::fromLatin1("isRequired")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qextension.h b/src/uml/qextension.h
index 3b1c7233..e1686c21 100644
--- a/src/uml/qextension.h
+++ b/src/uml/qextension.h
@@ -84,7 +84,7 @@ public:
 
     // Operations
     Q_INVOKABLE QProperty *metaclassEnd() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qextensionend.cpp b/src/uml/qextensionend.cpp
index fbb0258e..b716910a 100644
--- a/src/uml/qextensionend.cpp
+++ b/src/uml/qextensionend.cpp
@@ -144,18 +144,6 @@ qint32 QExtensionEnd::lowerBound() const
     return qint32(); // change here to your derived return
 }
 
-void QExtensionEnd::registerMetaTypes() const
-{
-    qRegisterMetaType<QStereotype *>("QStereotype *");
-    qRegisterMetaType<QSet<QStereotype *>>("QSet<QStereotype *>");
-    qRegisterMetaType<QList<QStereotype *>>("QList<QStereotype *>");
-
-    QProperty::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExtensionEnd::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionEnd")][QString::fromLatin1("lower")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qextensionend.h b/src/uml/qextensionend.h
index 2d013b32..f53e0661 100644
--- a/src/uml/qextensionend.h
+++ b/src/uml/qextensionend.h
@@ -81,7 +81,7 @@ public:
 
     // Operations
     Q_INVOKABLE qint32 lowerBound() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qextensionpoint.cpp b/src/uml/qextensionpoint.cpp
index bc78002f..cbb0da32 100644
--- a/src/uml/qextensionpoint.cpp
+++ b/src/uml/qextensionpoint.cpp
@@ -117,18 +117,6 @@ void QExtensionPoint::setUseCase(QUseCase *useCase)
     }
 }
 
-void QExtensionPoint::registerMetaTypes() const
-{
-    qRegisterMetaType<QUseCase *>("QUseCase *");
-    qRegisterMetaType<QSet<QUseCase *>>("QSet<QUseCase *>");
-    qRegisterMetaType<QList<QUseCase *>>("QList<QUseCase *>");
-
-    QRedefinableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QExtensionPoint::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QExtensionPoint")][QString::fromLatin1("useCase")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qextensionpoint.h b/src/uml/qextensionpoint.h
index 98fa2e9a..c92c6b94 100644
--- a/src/uml/qextensionpoint.h
+++ b/src/uml/qextensionpoint.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QExtensionPoint
     Q_INVOKABLE QUseCase *useCase() const;
     Q_INVOKABLE void setUseCase(QUseCase *useCase);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qfeature.cpp b/src/uml/qfeature.cpp
index e7d1d450..460f2bf3 100644
--- a/src/uml/qfeature.cpp
+++ b/src/uml/qfeature.cpp
@@ -158,18 +158,6 @@ QSet<QClassifier *> QFeature::featuringClassifiers() const
     return d->featuringClassifiers;
 }
 
-void QFeature::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    QRedefinableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QFeature::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QFeature")][QString::fromLatin1("isStatic")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qfeature.h b/src/uml/qfeature.h
index f22d2eaa..0bc1c0e2 100644
--- a/src/uml/qfeature.h
+++ b/src/uml/qfeature.h
@@ -81,7 +81,7 @@ public:
 
     // Association ends from QFeature
     Q_INVOKABLE QSet<QClassifier *> featuringClassifiers() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qfinalnode.cpp b/src/uml/qfinalnode.cpp
index dc2755fe..ff4d3cc2 100644
--- a/src/uml/qfinalnode.cpp
+++ b/src/uml/qfinalnode.cpp
@@ -78,14 +78,6 @@ QFinalNode::~QFinalNode()
 {
 }
 
-void QFinalNode::registerMetaTypes() const
-{
-    QControlNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QFinalNode::setPropertyData()
 {
     QControlNode::setPropertyData();
diff --git a/src/uml/qfinalnode.h b/src/uml/qfinalnode.h
index 02cb4489..b23ba298 100644
--- a/src/uml/qfinalnode.h
+++ b/src/uml/qfinalnode.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QFinalNode : public QControlNode
 public:
     Q_INVOKABLE explicit QFinalNode(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QFinalNode();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qfinalstate.cpp b/src/uml/qfinalstate.cpp
index 6700133e..9628ed5b 100644
--- a/src/uml/qfinalstate.cpp
+++ b/src/uml/qfinalstate.cpp
@@ -78,14 +78,6 @@ QFinalState::~QFinalState()
 {
 }
 
-void QFinalState::registerMetaTypes() const
-{
-    QState::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QFinalState::setPropertyData()
 {
     QState::setPropertyData();
diff --git a/src/uml/qfinalstate.h b/src/uml/qfinalstate.h
index ea9cb9e6..82dd25f0 100644
--- a/src/uml/qfinalstate.h
+++ b/src/uml/qfinalstate.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QFinalState : public QState
 public:
     Q_INVOKABLE explicit QFinalState(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QFinalState();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qflowfinalnode.cpp b/src/uml/qflowfinalnode.cpp
index 151d7de5..2ac6d1f3 100644
--- a/src/uml/qflowfinalnode.cpp
+++ b/src/uml/qflowfinalnode.cpp
@@ -78,14 +78,6 @@ QFlowFinalNode::~QFlowFinalNode()
 {
 }
 
-void QFlowFinalNode::registerMetaTypes() const
-{
-    QFinalNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QFlowFinalNode::setPropertyData()
 {
     QFinalNode::setPropertyData();
diff --git a/src/uml/qflowfinalnode.h b/src/uml/qflowfinalnode.h
index 47c5e347..b4fc9631 100644
--- a/src/uml/qflowfinalnode.h
+++ b/src/uml/qflowfinalnode.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QFlowFinalNode : public QFinalNode
 public:
     Q_INVOKABLE explicit QFlowFinalNode(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QFlowFinalNode();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qforknode.cpp b/src/uml/qforknode.cpp
index 51ab81c5..0275dd9c 100644
--- a/src/uml/qforknode.cpp
+++ b/src/uml/qforknode.cpp
@@ -78,14 +78,6 @@ QForkNode::~QForkNode()
 {
 }
 
-void QForkNode::registerMetaTypes() const
-{
-    QControlNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QForkNode::setPropertyData()
 {
     QControlNode::setPropertyData();
diff --git a/src/uml/qforknode.h b/src/uml/qforknode.h
index cda5b043..a131dd16 100644
--- a/src/uml/qforknode.h
+++ b/src/uml/qforknode.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QForkNode : public QControlNode
 public:
     Q_INVOKABLE explicit QForkNode(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QForkNode();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qfunctionbehavior.cpp b/src/uml/qfunctionbehavior.cpp
index 95f516c8..b5a31544 100644
--- a/src/uml/qfunctionbehavior.cpp
+++ b/src/uml/qfunctionbehavior.cpp
@@ -78,14 +78,6 @@ QFunctionBehavior::~QFunctionBehavior()
 {
 }
 
-void QFunctionBehavior::registerMetaTypes() const
-{
-    QOpaqueBehavior::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QFunctionBehavior::setPropertyData()
 {
     QOpaqueBehavior::setPropertyData();
diff --git a/src/uml/qfunctionbehavior.h b/src/uml/qfunctionbehavior.h
index 2510fe2d..5d049367 100644
--- a/src/uml/qfunctionbehavior.h
+++ b/src/uml/qfunctionbehavior.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QFunctionBehavior : public QOpaqueBehavior
 public:
     Q_INVOKABLE explicit QFunctionBehavior(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QFunctionBehavior();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qgate.cpp b/src/uml/qgate.cpp
index c8dc21fe..0243e617 100644
--- a/src/uml/qgate.cpp
+++ b/src/uml/qgate.cpp
@@ -78,14 +78,6 @@ QGate::~QGate()
 {
 }
 
-void QGate::registerMetaTypes() const
-{
-    QMessageEnd::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QGate::setPropertyData()
 {
     QMessageEnd::setPropertyData();
diff --git a/src/uml/qgate.h b/src/uml/qgate.h
index db993354..5e97e7b6 100644
--- a/src/uml/qgate.h
+++ b/src/uml/qgate.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QGate : public QMessageEnd
 public:
     Q_INVOKABLE explicit QGate(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QGate();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qgeneralization.cpp b/src/uml/qgeneralization.cpp
index 6d9a8263..fd3461de 100644
--- a/src/uml/qgeneralization.cpp
+++ b/src/uml/qgeneralization.cpp
@@ -226,22 +226,6 @@ void QGeneralization::setGeneral(QClassifier *general)
     }
 }
 
-void QGeneralization::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QGeneralizationSet *>("QGeneralizationSet *");
-    qRegisterMetaType<QSet<QGeneralizationSet *>>("QSet<QGeneralizationSet *>");
-    qRegisterMetaType<QList<QGeneralizationSet *>>("QList<QGeneralizationSet *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QGeneralization::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralization")][QString::fromLatin1("isSubstitutable")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qgeneralization.h b/src/uml/qgeneralization.h
index 4fa4e9a5..344543fb 100644
--- a/src/uml/qgeneralization.h
+++ b/src/uml/qgeneralization.h
@@ -90,7 +90,7 @@ public:
     Q_INVOKABLE void removeGeneralizationSet(QGeneralizationSet *generalizationSet);
     Q_INVOKABLE QClassifier *general() const;
     Q_INVOKABLE void setGeneral(QClassifier *general);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qgeneralizationset.cpp b/src/uml/qgeneralizationset.cpp
index f5d1f85a..b2500dc8 100644
--- a/src/uml/qgeneralizationset.cpp
+++ b/src/uml/qgeneralizationset.cpp
@@ -217,22 +217,6 @@ void QGeneralizationSet::removeGeneralization(QGeneralization *generalization)
     }
 }
 
-void QGeneralizationSet::registerMetaTypes() const
-{
-    qRegisterMetaType<QGeneralization *>("QGeneralization *");
-    qRegisterMetaType<QSet<QGeneralization *>>("QSet<QGeneralization *>");
-    qRegisterMetaType<QList<QGeneralization *>>("QList<QGeneralization *>");
-
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    QPackageableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QGeneralizationSet::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralizationSet")][QString::fromLatin1("isCovering")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qgeneralizationset.h b/src/uml/qgeneralizationset.h
index adde8e17..1c9d04fe 100644
--- a/src/uml/qgeneralizationset.h
+++ b/src/uml/qgeneralizationset.h
@@ -91,7 +91,7 @@ public:
     Q_INVOKABLE QSet<QGeneralization *> generalizations() const;
     Q_INVOKABLE void addGeneralization(QGeneralization *generalization);
     Q_INVOKABLE void removeGeneralization(QGeneralization *generalization);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qgeneralordering.cpp b/src/uml/qgeneralordering.cpp
index 45d6c32b..635da69f 100644
--- a/src/uml/qgeneralordering.cpp
+++ b/src/uml/qgeneralordering.cpp
@@ -144,18 +144,6 @@ void QGeneralOrdering::setAfter(QOccurrenceSpecification *after)
     }
 }
 
-void QGeneralOrdering::registerMetaTypes() const
-{
-    qRegisterMetaType<QOccurrenceSpecification *>("QOccurrenceSpecification *");
-    qRegisterMetaType<QSet<QOccurrenceSpecification *>>("QSet<QOccurrenceSpecification *>");
-    qRegisterMetaType<QList<QOccurrenceSpecification *>>("QList<QOccurrenceSpecification *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QGeneralOrdering::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QGeneralOrdering")][QString::fromLatin1("before")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qgeneralordering.h b/src/uml/qgeneralordering.h
index fb571f18..4eadb541 100644
--- a/src/uml/qgeneralordering.h
+++ b/src/uml/qgeneralordering.h
@@ -76,7 +76,7 @@ public:
     Q_INVOKABLE void setBefore(QOccurrenceSpecification *before);
     Q_INVOKABLE QOccurrenceSpecification *after() const;
     Q_INVOKABLE void setAfter(QOccurrenceSpecification *after);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qimage.cpp b/src/uml/qimage.cpp
index e59f75c5..55701786 100644
--- a/src/uml/qimage.cpp
+++ b/src/uml/qimage.cpp
@@ -145,14 +145,6 @@ void QImage::setContent(QString content)
     }
 }
 
-void QImage::registerMetaTypes() const
-{
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QImage::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QImage")][QString::fromLatin1("format")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qimage.h b/src/uml/qimage.h
index 31352461..e87e543c 100644
--- a/src/uml/qimage.h
+++ b/src/uml/qimage.h
@@ -79,7 +79,7 @@ public:
     Q_INVOKABLE void setLocation(QString location);
     Q_INVOKABLE QString content() const;
     Q_INVOKABLE void setContent(QString content);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinclude.cpp b/src/uml/qinclude.cpp
index 1eea0f50..fa0b58c9 100644
--- a/src/uml/qinclude.cpp
+++ b/src/uml/qinclude.cpp
@@ -308,18 +308,6 @@ void QInclude::setAddition(QUseCase *addition)
     }
 }
 
-void QInclude::registerMetaTypes() const
-{
-    qRegisterMetaType<QUseCase *>("QUseCase *");
-    qRegisterMetaType<QSet<QUseCase *>>("QSet<QUseCase *>");
-    qRegisterMetaType<QList<QUseCase *>>("QList<QUseCase *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInclude::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInclude")][QString::fromLatin1("includingCase")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qinclude.h b/src/uml/qinclude.h
index c646dd31..eda2584c 100644
--- a/src/uml/qinclude.h
+++ b/src/uml/qinclude.h
@@ -108,7 +108,7 @@ public:
     Q_INVOKABLE void setIncludingCase(QUseCase *includingCase);
     Q_INVOKABLE QUseCase *addition() const;
     Q_INVOKABLE void setAddition(QUseCase *addition);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinformationflow.cpp b/src/uml/qinformationflow.cpp
index 601a2177..fa39edb0 100644
--- a/src/uml/qinformationflow.cpp
+++ b/src/uml/qinformationflow.cpp
@@ -514,38 +514,6 @@ void QInformationFlow::removeRealization(QRelationship *realization)
     }
 }
 
-void QInformationFlow::registerMetaTypes() const
-{
-    qRegisterMetaType<QConnector *>("QConnector *");
-    qRegisterMetaType<QSet<QConnector *>>("QSet<QConnector *>");
-    qRegisterMetaType<QList<QConnector *>>("QList<QConnector *>");
-
-    qRegisterMetaType<QMessage *>("QMessage *");
-    qRegisterMetaType<QSet<QMessage *>>("QSet<QMessage *>");
-    qRegisterMetaType<QList<QMessage *>>("QList<QMessage *>");
-
-    qRegisterMetaType<QActivityEdge *>("QActivityEdge *");
-    qRegisterMetaType<QSet<QActivityEdge *>>("QSet<QActivityEdge *>");
-    qRegisterMetaType<QList<QActivityEdge *>>("QList<QActivityEdge *>");
-
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QRelationship *>("QRelationship *");
-    qRegisterMetaType<QSet<QRelationship *>>("QSet<QRelationship *>");
-    qRegisterMetaType<QList<QRelationship *>>("QList<QRelationship *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInformationFlow::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationFlow")][QString::fromLatin1("informationTargets")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qinformationflow.h b/src/uml/qinformationflow.h
index 96a43966..4cd8f7ee 100644
--- a/src/uml/qinformationflow.h
+++ b/src/uml/qinformationflow.h
@@ -147,7 +147,7 @@ public:
     Q_INVOKABLE QSet<QRelationship *> realizations() const;
     Q_INVOKABLE void addRealization(QRelationship *realization);
     Q_INVOKABLE void removeRealization(QRelationship *realization);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinformationitem.cpp b/src/uml/qinformationitem.cpp
index a531edee..3c0890c6 100644
--- a/src/uml/qinformationitem.cpp
+++ b/src/uml/qinformationitem.cpp
@@ -113,14 +113,6 @@ void QInformationItem::removeRepresented(QClassifier *represented)
     }
 }
 
-void QInformationItem::registerMetaTypes() const
-{
-    QClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInformationItem::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInformationItem")][QString::fromLatin1("represented")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qinformationitem.h b/src/uml/qinformationitem.h
index 9323330d..bea98164 100644
--- a/src/uml/qinformationitem.h
+++ b/src/uml/qinformationitem.h
@@ -74,7 +74,7 @@ public:
     Q_INVOKABLE QSet<QClassifier *> represented() const;
     Q_INVOKABLE void addRepresented(QClassifier *represented);
     Q_INVOKABLE void removeRepresented(QClassifier *represented);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinitialnode.cpp b/src/uml/qinitialnode.cpp
index 371f95be..80f71b38 100644
--- a/src/uml/qinitialnode.cpp
+++ b/src/uml/qinitialnode.cpp
@@ -78,14 +78,6 @@ QInitialNode::~QInitialNode()
 {
 }
 
-void QInitialNode::registerMetaTypes() const
-{
-    QControlNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInitialNode::setPropertyData()
 {
     QControlNode::setPropertyData();
diff --git a/src/uml/qinitialnode.h b/src/uml/qinitialnode.h
index b13f68fd..074947f9 100644
--- a/src/uml/qinitialnode.h
+++ b/src/uml/qinitialnode.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QInitialNode : public QControlNode
 public:
     Q_INVOKABLE explicit QInitialNode(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QInitialNode();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinputpin.cpp b/src/uml/qinputpin.cpp
index 9f146b5a..99361bda 100644
--- a/src/uml/qinputpin.cpp
+++ b/src/uml/qinputpin.cpp
@@ -78,14 +78,6 @@ QInputPin::~QInputPin()
 {
 }
 
-void QInputPin::registerMetaTypes() const
-{
-    QPin::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInputPin::setPropertyData()
 {
     QPin::setPropertyData();
diff --git a/src/uml/qinputpin.h b/src/uml/qinputpin.h
index ffc03c08..d2503301 100644
--- a/src/uml/qinputpin.h
+++ b/src/uml/qinputpin.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QInputPin : public QPin
 public:
     Q_INVOKABLE explicit QInputPin(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QInputPin();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinstancespecification.cpp b/src/uml/qinstancespecification.cpp
index d1911a61..49d387d4 100644
--- a/src/uml/qinstancespecification.cpp
+++ b/src/uml/qinstancespecification.cpp
@@ -386,26 +386,6 @@ void QInstanceSpecification::removeSlot_(QSlot *slot_)
     }
 }
 
-void QInstanceSpecification::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QSlot *>("QSlot *");
-    qRegisterMetaType<QSet<QSlot *>>("QSet<QSlot *>");
-    qRegisterMetaType<QList<QSlot *>>("QList<QSlot *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInstanceSpecification::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceSpecification")][QString::fromLatin1("classifiers")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qinstancespecification.h b/src/uml/qinstancespecification.h
index 1f43800b..a63775a1 100644
--- a/src/uml/qinstancespecification.h
+++ b/src/uml/qinstancespecification.h
@@ -127,7 +127,7 @@ public:
     Q_INVOKABLE QSet<QSlot *> slots_() const;
     Q_INVOKABLE void addSlot_(QSlot *slot_);
     Q_INVOKABLE void removeSlot_(QSlot *slot_);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinstancevalue.cpp b/src/uml/qinstancevalue.cpp
index 07f0744c..a0388d48 100644
--- a/src/uml/qinstancevalue.cpp
+++ b/src/uml/qinstancevalue.cpp
@@ -106,18 +106,6 @@ void QInstanceValue::setInstance(QInstanceSpecification *instance)
     }
 }
 
-void QInstanceValue::registerMetaTypes() const
-{
-    qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *");
-    qRegisterMetaType<QSet<QInstanceSpecification *>>("QSet<QInstanceSpecification *>");
-    qRegisterMetaType<QList<QInstanceSpecification *>>("QList<QInstanceSpecification *>");
-
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInstanceValue::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInstanceValue")][QString::fromLatin1("instance")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qinstancevalue.h b/src/uml/qinstancevalue.h
index 709467b6..61ddcbfd 100644
--- a/src/uml/qinstancevalue.h
+++ b/src/uml/qinstancevalue.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QInstanceValue
     Q_INVOKABLE QInstanceSpecification *instance() const;
     Q_INVOKABLE void setInstance(QInstanceSpecification *instance);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinteraction.cpp b/src/uml/qinteraction.cpp
index 871c18fb..a50b28c2 100644
--- a/src/uml/qinteraction.cpp
+++ b/src/uml/qinteraction.cpp
@@ -618,30 +618,6 @@ void QInteraction::removeLifeline(QLifeline *lifeline)
     }
 }
 
-void QInteraction::registerMetaTypes() const
-{
-    qRegisterMetaType<QMessage *>("QMessage *");
-    qRegisterMetaType<QSet<QMessage *>>("QSet<QMessage *>");
-    qRegisterMetaType<QList<QMessage *>>("QList<QMessage *>");
-
-    qRegisterMetaType<QLifeline *>("QLifeline *");
-    qRegisterMetaType<QSet<QLifeline *>>("QSet<QLifeline *>");
-    qRegisterMetaType<QList<QLifeline *>>("QList<QLifeline *>");
-
-    qRegisterMetaType<QAction *>("QAction *");
-    qRegisterMetaType<QSet<QAction *>>("QSet<QAction *>");
-    qRegisterMetaType<QList<QAction *>>("QList<QAction *>");
-
-    qRegisterMetaType<QGate *>("QGate *");
-    qRegisterMetaType<QSet<QGate *>>("QSet<QGate *>");
-    qRegisterMetaType<QList<QGate *>>("QList<QGate *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInteraction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInteraction")][QString::fromLatin1("actions")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qinteraction.h b/src/uml/qinteraction.h
index 1c11cf7a..4c832ad8 100644
--- a/src/uml/qinteraction.h
+++ b/src/uml/qinteraction.h
@@ -159,7 +159,7 @@ public:
     Q_INVOKABLE QSet<QLifeline *> lifelines() const;
     Q_INVOKABLE void addLifeline(QLifeline *lifeline);
     Q_INVOKABLE void removeLifeline(QLifeline *lifeline);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinteractionconstraint.cpp b/src/uml/qinteractionconstraint.cpp
index 590f4afa..15f35158 100644
--- a/src/uml/qinteractionconstraint.cpp
+++ b/src/uml/qinteractionconstraint.cpp
@@ -144,18 +144,6 @@ void QInteractionConstraint::setMinint(QValueSpecification *minint)
     }
 }
 
-void QInteractionConstraint::registerMetaTypes() const
-{
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QConstraint::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInteractionConstraint::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionConstraint")][QString::fromLatin1("maxint")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qinteractionconstraint.h b/src/uml/qinteractionconstraint.h
index 9aba7f33..ed45de50 100644
--- a/src/uml/qinteractionconstraint.h
+++ b/src/uml/qinteractionconstraint.h
@@ -76,7 +76,7 @@ public:
     Q_INVOKABLE void setMaxint(QValueSpecification *maxint);
     Q_INVOKABLE QValueSpecification *minint() const;
     Q_INVOKABLE void setMinint(QValueSpecification *minint);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinteractionfragment.cpp b/src/uml/qinteractionfragment.cpp
index 56effc94..9c21eeeb 100644
--- a/src/uml/qinteractionfragment.cpp
+++ b/src/uml/qinteractionfragment.cpp
@@ -228,30 +228,6 @@ void QInteractionFragment::setEnclosingOperand(QInteractionOperand *enclosingOpe
     }
 }
 
-void QInteractionFragment::registerMetaTypes() const
-{
-    qRegisterMetaType<QGeneralOrdering *>("QGeneralOrdering *");
-    qRegisterMetaType<QSet<QGeneralOrdering *>>("QSet<QGeneralOrdering *>");
-    qRegisterMetaType<QList<QGeneralOrdering *>>("QList<QGeneralOrdering *>");
-
-    qRegisterMetaType<QInteractionOperand *>("QInteractionOperand *");
-    qRegisterMetaType<QSet<QInteractionOperand *>>("QSet<QInteractionOperand *>");
-    qRegisterMetaType<QList<QInteractionOperand *>>("QList<QInteractionOperand *>");
-
-    qRegisterMetaType<QLifeline *>("QLifeline *");
-    qRegisterMetaType<QSet<QLifeline *>>("QSet<QLifeline *>");
-    qRegisterMetaType<QList<QLifeline *>>("QList<QLifeline *>");
-
-    qRegisterMetaType<QInteraction *>("QInteraction *");
-    qRegisterMetaType<QSet<QInteraction *>>("QSet<QInteraction *>");
-    qRegisterMetaType<QList<QInteraction *>>("QList<QInteraction *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInteractionFragment::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionFragment")][QString::fromLatin1("generalOrderings")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qinteractionfragment.h b/src/uml/qinteractionfragment.h
index a079dca2..5cedd29f 100644
--- a/src/uml/qinteractionfragment.h
+++ b/src/uml/qinteractionfragment.h
@@ -90,7 +90,7 @@ public:
     Q_INVOKABLE void removeCovered(QLifeline *covered);
     Q_INVOKABLE QInteractionOperand *enclosingOperand() const;
     Q_INVOKABLE void setEnclosingOperand(QInteractionOperand *enclosingOperand);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinteractionoperand.cpp b/src/uml/qinteractionoperand.cpp
index 7e17a8a6..d4090038 100644
--- a/src/uml/qinteractionoperand.cpp
+++ b/src/uml/qinteractionoperand.cpp
@@ -428,18 +428,6 @@ void QInteractionOperand::setGuard(QInteractionConstraint *guard)
     }
 }
 
-void QInteractionOperand::registerMetaTypes() const
-{
-    qRegisterMetaType<QInteractionConstraint *>("QInteractionConstraint *");
-    qRegisterMetaType<QSet<QInteractionConstraint *>>("QSet<QInteractionConstraint *>");
-    qRegisterMetaType<QList<QInteractionConstraint *>>("QList<QInteractionConstraint *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInteractionOperand::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionOperand")][QString::fromLatin1("fragments")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qinteractionoperand.h b/src/uml/qinteractionoperand.h
index fee9088e..22283b88 100644
--- a/src/uml/qinteractionoperand.h
+++ b/src/uml/qinteractionoperand.h
@@ -131,7 +131,7 @@ public:
     Q_INVOKABLE void removeFragment(QInteractionFragment *fragment);
     Q_INVOKABLE QInteractionConstraint *guard() const;
     Q_INVOKABLE void setGuard(QInteractionConstraint *guard);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinteractionuse.cpp b/src/uml/qinteractionuse.cpp
index 0d27d225..8fb42574 100644
--- a/src/uml/qinteractionuse.cpp
+++ b/src/uml/qinteractionuse.cpp
@@ -235,30 +235,6 @@ void QInteractionUse::setReturnValueRecipient(QProperty *returnValueRecipient)
     }
 }
 
-void QInteractionUse::registerMetaTypes() const
-{
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QInteraction *>("QInteraction *");
-    qRegisterMetaType<QSet<QInteraction *>>("QSet<QInteraction *>");
-    qRegisterMetaType<QList<QInteraction *>>("QList<QInteraction *>");
-
-    qRegisterMetaType<QGate *>("QGate *");
-    qRegisterMetaType<QSet<QGate *>>("QSet<QGate *>");
-    qRegisterMetaType<QList<QGate *>>("QList<QGate *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QInteractionFragment::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInteractionUse::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInteractionUse")][QString::fromLatin1("actualGates")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qinteractionuse.h b/src/uml/qinteractionuse.h
index c61d2d5c..39c9c1ce 100644
--- a/src/uml/qinteractionuse.h
+++ b/src/uml/qinteractionuse.h
@@ -94,7 +94,7 @@ public:
     Q_INVOKABLE void removeArgument(QValueSpecification *argument);
     Q_INVOKABLE QProperty *returnValueRecipient() const;
     Q_INVOKABLE void setReturnValueRecipient(QProperty *returnValueRecipient);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinterface.cpp b/src/uml/qinterface.cpp
index fdab6e4d..78f3aa33 100644
--- a/src/uml/qinterface.cpp
+++ b/src/uml/qinterface.cpp
@@ -320,30 +320,6 @@ void QInterface::removeOwnedAttribute(QProperty *ownedAttribute)
     }
 }
 
-void QInterface::registerMetaTypes() const
-{
-    qRegisterMetaType<QProtocolStateMachine *>("QProtocolStateMachine *");
-    qRegisterMetaType<QSet<QProtocolStateMachine *>>("QSet<QProtocolStateMachine *>");
-    qRegisterMetaType<QList<QProtocolStateMachine *>>("QList<QProtocolStateMachine *>");
-
-    qRegisterMetaType<QReception *>("QReception *");
-    qRegisterMetaType<QSet<QReception *>>("QSet<QReception *>");
-    qRegisterMetaType<QList<QReception *>>("QList<QReception *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    QClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInterface::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInterface")][QString::fromLatin1("protocol")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qinterface.h b/src/uml/qinterface.h
index 7abbbc97..0ef00265 100644
--- a/src/uml/qinterface.h
+++ b/src/uml/qinterface.h
@@ -107,7 +107,7 @@ public:
     // Overriden methods for subsetted properties
     Q_INVOKABLE void addRedefinedClassifier(QWrappedObjectPointer<QInterface> redefinedInterface);
     Q_INVOKABLE void removeRedefinedClassifier(QWrappedObjectPointer<QInterface> redefinedInterface);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinterfacerealization.cpp b/src/uml/qinterfacerealization.cpp
index 7ba11b49..e5e52b04 100644
--- a/src/uml/qinterfacerealization.cpp
+++ b/src/uml/qinterfacerealization.cpp
@@ -154,22 +154,6 @@ void QInterfaceRealization::setContract(QInterface *contract)
     }
 }
 
-void QInterfaceRealization::registerMetaTypes() const
-{
-    qRegisterMetaType<QInterface *>("QInterface *");
-    qRegisterMetaType<QSet<QInterface *>>("QSet<QInterface *>");
-    qRegisterMetaType<QList<QInterface *>>("QList<QInterface *>");
-
-    qRegisterMetaType<QBehavioredClassifier *>("QBehavioredClassifier *");
-    qRegisterMetaType<QSet<QBehavioredClassifier *>>("QSet<QBehavioredClassifier *>");
-    qRegisterMetaType<QList<QBehavioredClassifier *>>("QList<QBehavioredClassifier *>");
-
-    QRealization::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInterfaceRealization::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInterfaceRealization")][QString::fromLatin1("implementingClassifier")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qinterfacerealization.h b/src/uml/qinterfacerealization.h
index 784e40ef..228b079e 100644
--- a/src/uml/qinterfacerealization.h
+++ b/src/uml/qinterfacerealization.h
@@ -86,7 +86,7 @@ public:
     Q_INVOKABLE void removeClient(QWrappedObjectPointer<QBehavioredClassifier> implementingClassifier);
     Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QInterface> contract);
     Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QInterface> contract);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinterruptibleactivityregion.cpp b/src/uml/qinterruptibleactivityregion.cpp
index 332f74e4..e2432f58 100644
--- a/src/uml/qinterruptibleactivityregion.cpp
+++ b/src/uml/qinterruptibleactivityregion.cpp
@@ -166,22 +166,6 @@ void QInterruptibleActivityRegion::removeNode(QActivityNode *node)
     }
 }
 
-void QInterruptibleActivityRegion::registerMetaTypes() const
-{
-    qRegisterMetaType<QActivityEdge *>("QActivityEdge *");
-    qRegisterMetaType<QSet<QActivityEdge *>>("QSet<QActivityEdge *>");
-    qRegisterMetaType<QList<QActivityEdge *>>("QList<QActivityEdge *>");
-
-    qRegisterMetaType<QActivityNode *>("QActivityNode *");
-    qRegisterMetaType<QSet<QActivityNode *>>("QSet<QActivityNode *>");
-    qRegisterMetaType<QList<QActivityNode *>>("QList<QActivityNode *>");
-
-    QActivityGroup::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInterruptibleActivityRegion::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInterruptibleActivityRegion")][QString::fromLatin1("interruptingEdges")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qinterruptibleactivityregion.h b/src/uml/qinterruptibleactivityregion.h
index 43837502..be34cdad 100644
--- a/src/uml/qinterruptibleactivityregion.h
+++ b/src/uml/qinterruptibleactivityregion.h
@@ -82,7 +82,7 @@ public:
     Q_INVOKABLE QSet<QActivityNode *> nodes() const;
     Q_INVOKABLE void addNode(QActivityNode *node);
     Q_INVOKABLE void removeNode(QActivityNode *node);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinterval.cpp b/src/uml/qinterval.cpp
index 21732934..bae65da7 100644
--- a/src/uml/qinterval.cpp
+++ b/src/uml/qinterval.cpp
@@ -126,14 +126,6 @@ void QInterval::setMax(QValueSpecification *max)
     }
 }
 
-void QInterval::registerMetaTypes() const
-{
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInterval::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInterval")][QString::fromLatin1("min")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qinterval.h b/src/uml/qinterval.h
index 67ab563a..ec684121 100644
--- a/src/uml/qinterval.h
+++ b/src/uml/qinterval.h
@@ -73,7 +73,7 @@ public:
     Q_INVOKABLE void setMin(QValueSpecification *min);
     Q_INVOKABLE QValueSpecification *max() const;
     Q_INVOKABLE void setMax(QValueSpecification *max);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qintervalconstraint.cpp b/src/uml/qintervalconstraint.cpp
index a5c580cc..85741135 100644
--- a/src/uml/qintervalconstraint.cpp
+++ b/src/uml/qintervalconstraint.cpp
@@ -109,18 +109,6 @@ void QIntervalConstraint::setSpecification(QInterval *specification)
     }
 }
 
-void QIntervalConstraint::registerMetaTypes() const
-{
-    qRegisterMetaType<QInterval *>("QInterval *");
-    qRegisterMetaType<QSet<QInterval *>>("QSet<QInterval *>");
-    qRegisterMetaType<QList<QInterval *>>("QList<QInterval *>");
-
-    QConstraint::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QIntervalConstraint::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QIntervalConstraint")][QString::fromLatin1("specification")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qintervalconstraint.h b/src/uml/qintervalconstraint.h
index 35047331..ebd6a002 100644
--- a/src/uml/qintervalconstraint.h
+++ b/src/uml/qintervalconstraint.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QIntervalConstraint
     Q_INVOKABLE QInterval *specification() const;
     Q_INVOKABLE void setSpecification(QInterval *specification);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qinvocationaction.cpp b/src/uml/qinvocationaction.cpp
index 8bfe9f89..03ff4ea6 100644
--- a/src/uml/qinvocationaction.cpp
+++ b/src/uml/qinvocationaction.cpp
@@ -144,22 +144,6 @@ void QInvocationAction::setOnPort(QPort *onPort)
     }
 }
 
-void QInvocationAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QPort *>("QPort *");
-    qRegisterMetaType<QSet<QPort *>>("QSet<QPort *>");
-    qRegisterMetaType<QList<QPort *>>("QList<QPort *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QInvocationAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QInvocationAction")][QString::fromLatin1("arguments")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qinvocationaction.h b/src/uml/qinvocationaction.h
index 6e26c1bd..b3f2c53e 100644
--- a/src/uml/qinvocationaction.h
+++ b/src/uml/qinvocationaction.h
@@ -81,7 +81,7 @@ public:
     Q_INVOKABLE void removeArgument(QInputPin *argument);
     Q_INVOKABLE QPort *onPort() const;
     Q_INVOKABLE void setOnPort(QPort *onPort);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qjoinnode.cpp b/src/uml/qjoinnode.cpp
index 1e4dbe52..0c9372af 100644
--- a/src/uml/qjoinnode.cpp
+++ b/src/uml/qjoinnode.cpp
@@ -148,18 +148,6 @@ void QJoinNode::setJoinSpec(QValueSpecification *joinSpec)
     }
 }
 
-void QJoinNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QControlNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QJoinNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QJoinNode")][QString::fromLatin1("isCombineDuplicate")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qjoinnode.h b/src/uml/qjoinnode.h
index aecb799d..f016f150 100644
--- a/src/uml/qjoinnode.h
+++ b/src/uml/qjoinnode.h
@@ -79,7 +79,7 @@ public:
     // Association ends from QJoinNode
     Q_INVOKABLE QValueSpecification *joinSpec() const;
     Q_INVOKABLE void setJoinSpec(QValueSpecification *joinSpec);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qlifeline.cpp b/src/uml/qlifeline.cpp
index ca10b8b9..0c5d624e 100644
--- a/src/uml/qlifeline.cpp
+++ b/src/uml/qlifeline.cpp
@@ -233,34 +233,6 @@ void QLifeline::setSelector(QValueSpecification *selector)
     }
 }
 
-void QLifeline::registerMetaTypes() const
-{
-    qRegisterMetaType<QConnectableElement *>("QConnectableElement *");
-    qRegisterMetaType<QSet<QConnectableElement *>>("QSet<QConnectableElement *>");
-    qRegisterMetaType<QList<QConnectableElement *>>("QList<QConnectableElement *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    qRegisterMetaType<QInteraction *>("QInteraction *");
-    qRegisterMetaType<QSet<QInteraction *>>("QSet<QInteraction *>");
-    qRegisterMetaType<QList<QInteraction *>>("QList<QInteraction *>");
-
-    qRegisterMetaType<QInteractionFragment *>("QInteractionFragment *");
-    qRegisterMetaType<QSet<QInteractionFragment *>>("QSet<QInteractionFragment *>");
-    qRegisterMetaType<QList<QInteractionFragment *>>("QList<QInteractionFragment *>");
-
-    qRegisterMetaType<QPartDecomposition *>("QPartDecomposition *");
-    qRegisterMetaType<QSet<QPartDecomposition *>>("QSet<QPartDecomposition *>");
-    qRegisterMetaType<QList<QPartDecomposition *>>("QList<QPartDecomposition *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLifeline::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLifeline")][QString::fromLatin1("represents")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qlifeline.h b/src/uml/qlifeline.h
index efeb0e5b..43fc8807 100644
--- a/src/uml/qlifeline.h
+++ b/src/uml/qlifeline.h
@@ -93,7 +93,7 @@ public:
     Q_INVOKABLE void setInteraction(QInteraction *interaction);
     Q_INVOKABLE QValueSpecification *selector() const;
     Q_INVOKABLE void setSelector(QValueSpecification *selector);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qlinkaction.cpp b/src/uml/qlinkaction.cpp
index 2ed20ffd..ab2857af 100644
--- a/src/uml/qlinkaction.cpp
+++ b/src/uml/qlinkaction.cpp
@@ -170,26 +170,6 @@ QAssociation *QLinkAction::association() const
     return 0; // change here to your derived return
 }
 
-void QLinkAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QLinkEndData *>("QLinkEndData *");
-    qRegisterMetaType<QSet<QLinkEndData *>>("QSet<QLinkEndData *>");
-    qRegisterMetaType<QList<QLinkEndData *>>("QList<QLinkEndData *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QAssociation *>("QAssociation *");
-    qRegisterMetaType<QSet<QAssociation *>>("QSet<QAssociation *>");
-    qRegisterMetaType<QList<QAssociation *>>("QList<QAssociation *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLinkAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkAction")][QString::fromLatin1("inputValues")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qlinkaction.h b/src/uml/qlinkaction.h
index 28397e11..c2296cab 100644
--- a/src/uml/qlinkaction.h
+++ b/src/uml/qlinkaction.h
@@ -86,7 +86,7 @@ public:
 
     // Operations
     Q_INVOKABLE QAssociation *association() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qlinkendcreationdata.cpp b/src/uml/qlinkendcreationdata.cpp
index b3b49954..feba72c1 100644
--- a/src/uml/qlinkendcreationdata.cpp
+++ b/src/uml/qlinkendcreationdata.cpp
@@ -140,18 +140,6 @@ void QLinkEndCreationData::setInsertAt(QInputPin *insertAt)
     }
 }
 
-void QLinkEndCreationData::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QLinkEndData::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLinkEndCreationData::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndCreationData")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qlinkendcreationdata.h b/src/uml/qlinkendcreationdata.h
index 074d76f9..cb58fb6d 100644
--- a/src/uml/qlinkendcreationdata.h
+++ b/src/uml/qlinkendcreationdata.h
@@ -79,7 +79,7 @@ public:
     // Association ends from QLinkEndCreationData
     Q_INVOKABLE QInputPin *insertAt() const;
     Q_INVOKABLE void setInsertAt(QInputPin *insertAt);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qlinkenddata.cpp b/src/uml/qlinkenddata.cpp
index 5091e6d5..85346fd6 100644
--- a/src/uml/qlinkenddata.cpp
+++ b/src/uml/qlinkenddata.cpp
@@ -167,26 +167,6 @@ void QLinkEndData::removeQualifier(QQualifierValue *qualifier)
     }
 }
 
-void QLinkEndData::registerMetaTypes() const
-{
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QQualifierValue *>("QQualifierValue *");
-    qRegisterMetaType<QSet<QQualifierValue *>>("QSet<QQualifierValue *>");
-    qRegisterMetaType<QList<QQualifierValue *>>("QList<QQualifierValue *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLinkEndData::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndData")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qlinkenddata.h b/src/uml/qlinkenddata.h
index 4b4afe49..aae12bf1 100644
--- a/src/uml/qlinkenddata.h
+++ b/src/uml/qlinkenddata.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE QSet<QQualifierValue *> qualifiers() const;
     Q_INVOKABLE void addQualifier(QQualifierValue *qualifier);
     Q_INVOKABLE void removeQualifier(QQualifierValue *qualifier);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qlinkenddestructiondata.cpp b/src/uml/qlinkenddestructiondata.cpp
index 17035fdb..291c1528 100644
--- a/src/uml/qlinkenddestructiondata.cpp
+++ b/src/uml/qlinkenddestructiondata.cpp
@@ -140,18 +140,6 @@ void QLinkEndDestructionData::setDestroyAt(QInputPin *destroyAt)
     }
 }
 
-void QLinkEndDestructionData::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QLinkEndData::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLinkEndDestructionData::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLinkEndDestructionData")][QString::fromLatin1("isDestroyDuplicates")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qlinkenddestructiondata.h b/src/uml/qlinkenddestructiondata.h
index bfe804e1..9cf18e50 100644
--- a/src/uml/qlinkenddestructiondata.h
+++ b/src/uml/qlinkenddestructiondata.h
@@ -79,7 +79,7 @@ public:
     // Association ends from QLinkEndDestructionData
     Q_INVOKABLE QInputPin *destroyAt() const;
     Q_INVOKABLE void setDestroyAt(QInputPin *destroyAt);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qliteralboolean.cpp b/src/uml/qliteralboolean.cpp
index 27864325..e4041c14 100644
--- a/src/uml/qliteralboolean.cpp
+++ b/src/uml/qliteralboolean.cpp
@@ -132,14 +132,6 @@ bool QLiteralBoolean::isComputable() const
     return bool(); // change here to your derived return
 }
 
-void QLiteralBoolean::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralBoolean::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralBoolean")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qliteralboolean.h b/src/uml/qliteralboolean.h
index 2c608590..d916067c 100644
--- a/src/uml/qliteralboolean.h
+++ b/src/uml/qliteralboolean.h
@@ -75,7 +75,7 @@ public:
     // Operations
     Q_INVOKABLE bool booleanValue() const;
     Q_INVOKABLE bool isComputable() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qliteralinteger.cpp b/src/uml/qliteralinteger.cpp
index a488a6ee..ad58eba5 100644
--- a/src/uml/qliteralinteger.cpp
+++ b/src/uml/qliteralinteger.cpp
@@ -123,14 +123,6 @@ bool QLiteralInteger::isComputable() const
     return bool(); // change here to your derived return
 }
 
-void QLiteralInteger::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralInteger::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralInteger")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qliteralinteger.h b/src/uml/qliteralinteger.h
index bd6e8307..c1316daf 100644
--- a/src/uml/qliteralinteger.h
+++ b/src/uml/qliteralinteger.h
@@ -74,7 +74,7 @@ public:
     // Operations
     Q_INVOKABLE qint32 integerValue() const;
     Q_INVOKABLE bool isComputable() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qliteralnull.cpp b/src/uml/qliteralnull.cpp
index 41f1114a..cc70813c 100644
--- a/src/uml/qliteralnull.cpp
+++ b/src/uml/qliteralnull.cpp
@@ -98,14 +98,6 @@ bool QLiteralNull::isNull() const
     return bool(); // change here to your derived return
 }
 
-void QLiteralNull::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralNull::setPropertyData()
 {
     QLiteralSpecification::setPropertyData();
diff --git a/src/uml/qliteralnull.h b/src/uml/qliteralnull.h
index 3e2de528..404a250f 100644
--- a/src/uml/qliteralnull.h
+++ b/src/uml/qliteralnull.h
@@ -68,7 +68,7 @@ public:
     // Operations
     Q_INVOKABLE bool isComputable() const;
     Q_INVOKABLE bool isNull() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qliteralreal.cpp b/src/uml/qliteralreal.cpp
index 7ac716f2..25c44ba9 100644
--- a/src/uml/qliteralreal.cpp
+++ b/src/uml/qliteralreal.cpp
@@ -120,14 +120,6 @@ qreal QLiteralReal::realValue() const
     return qreal(); // change here to your derived return
 }
 
-void QLiteralReal::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralReal::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralReal")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qliteralreal.h b/src/uml/qliteralreal.h
index ecd93083..b6f5d31c 100644
--- a/src/uml/qliteralreal.h
+++ b/src/uml/qliteralreal.h
@@ -74,7 +74,7 @@ public:
     // Operations
     Q_INVOKABLE bool isComputable() const;
     Q_INVOKABLE qreal realValue() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qliteralspecification.cpp b/src/uml/qliteralspecification.cpp
index 4b5e4724..b9efc289 100644
--- a/src/uml/qliteralspecification.cpp
+++ b/src/uml/qliteralspecification.cpp
@@ -78,14 +78,6 @@ QLiteralSpecification::~QLiteralSpecification()
 {
 }
 
-void QLiteralSpecification::registerMetaTypes() const
-{
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralSpecification::setPropertyData()
 {
     QValueSpecification::setPropertyData();
diff --git a/src/uml/qliteralspecification.h b/src/uml/qliteralspecification.h
index 9f24801f..716a4c12 100644
--- a/src/uml/qliteralspecification.h
+++ b/src/uml/qliteralspecification.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QLiteralSpecification : public QValueSpecification
 public:
     Q_INVOKABLE explicit QLiteralSpecification(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QLiteralSpecification();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qliteralstring.cpp b/src/uml/qliteralstring.cpp
index 57ccb617..17a9c98e 100644
--- a/src/uml/qliteralstring.cpp
+++ b/src/uml/qliteralstring.cpp
@@ -123,14 +123,6 @@ QString QLiteralString::stringValue() const
     return QString(); // change here to your derived return
 }
 
-void QLiteralString::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralString::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralString")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qliteralstring.h b/src/uml/qliteralstring.h
index 481b5f36..5b40de66 100644
--- a/src/uml/qliteralstring.h
+++ b/src/uml/qliteralstring.h
@@ -77,7 +77,7 @@ public:
     // Operations
     Q_INVOKABLE bool isComputable() const;
     Q_INVOKABLE QString stringValue() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qliteralunlimitednatural.cpp b/src/uml/qliteralunlimitednatural.cpp
index 85c0a1fb..2a251ca5 100644
--- a/src/uml/qliteralunlimitednatural.cpp
+++ b/src/uml/qliteralunlimitednatural.cpp
@@ -132,14 +132,6 @@ qint32 QLiteralUnlimitedNatural::unlimitedValue() const
     return qint32(); // change here to your derived return
 }
 
-void QLiteralUnlimitedNatural::registerMetaTypes() const
-{
-    QLiteralSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLiteralUnlimitedNatural::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLiteralUnlimitedNatural")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qliteralunlimitednatural.h b/src/uml/qliteralunlimitednatural.h
index 1c900bb0..23499e9c 100644
--- a/src/uml/qliteralunlimitednatural.h
+++ b/src/uml/qliteralunlimitednatural.h
@@ -75,7 +75,7 @@ public:
     // Operations
     Q_INVOKABLE bool isComputable() const;
     Q_INVOKABLE qint32 unlimitedValue() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qloopnode.cpp b/src/uml/qloopnode.cpp
index b30baa26..62020c81 100644
--- a/src/uml/qloopnode.cpp
+++ b/src/uml/qloopnode.cpp
@@ -363,26 +363,6 @@ void QLoopNode::removeTest(QExecutableNode *test)
     }
 }
 
-void QLoopNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    qRegisterMetaType<QExecutableNode *>("QExecutableNode *");
-    qRegisterMetaType<QSet<QExecutableNode *>>("QSet<QExecutableNode *>");
-    qRegisterMetaType<QList<QExecutableNode *>>("QList<QExecutableNode *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QStructuredActivityNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QLoopNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QLoopNode")][QString::fromLatin1("isTestedFirst")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qloopnode.h b/src/uml/qloopnode.h
index c6e0099a..6943d057 100644
--- a/src/uml/qloopnode.h
+++ b/src/uml/qloopnode.h
@@ -113,7 +113,7 @@ public:
     Q_INVOKABLE QSet<QExecutableNode *> tests() const;
     Q_INVOKABLE void addTest(QExecutableNode *test);
     Q_INVOKABLE void removeTest(QExecutableNode *test);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qmanifestation.cpp b/src/uml/qmanifestation.cpp
index 572ea22a..41886757 100644
--- a/src/uml/qmanifestation.cpp
+++ b/src/uml/qmanifestation.cpp
@@ -114,18 +114,6 @@ void QManifestation::setUtilizedElement(QPackageableElement *utilizedElement)
     }
 }
 
-void QManifestation::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackageableElement *>("QPackageableElement *");
-    qRegisterMetaType<QSet<QPackageableElement *>>("QSet<QPackageableElement *>");
-    qRegisterMetaType<QList<QPackageableElement *>>("QList<QPackageableElement *>");
-
-    QAbstraction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QManifestation::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QManifestation")][QString::fromLatin1("utilizedElement")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qmanifestation.h b/src/uml/qmanifestation.h
index e018c03a..9564439e 100644
--- a/src/uml/qmanifestation.h
+++ b/src/uml/qmanifestation.h
@@ -80,7 +80,7 @@ public:
     // Overriden methods for subsetted properties
     Q_INVOKABLE void addSupplier(QWrappedObjectPointer<QPackageableElement> utilizedElement);
     Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QPackageableElement> utilizedElement);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qmergenode.cpp b/src/uml/qmergenode.cpp
index a19eaf7c..46271aa6 100644
--- a/src/uml/qmergenode.cpp
+++ b/src/uml/qmergenode.cpp
@@ -78,14 +78,6 @@ QMergeNode::~QMergeNode()
 {
 }
 
-void QMergeNode::registerMetaTypes() const
-{
-    QControlNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QMergeNode::setPropertyData()
 {
     QControlNode::setPropertyData();
diff --git a/src/uml/qmergenode.h b/src/uml/qmergenode.h
index 6705e185..f324ab29 100644
--- a/src/uml/qmergenode.h
+++ b/src/uml/qmergenode.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QMergeNode : public QControlNode
 public:
     Q_INVOKABLE explicit QMergeNode(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QMergeNode();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qmessage.cpp b/src/uml/qmessage.cpp
index 47730f96..db4a19f4 100644
--- a/src/uml/qmessage.cpp
+++ b/src/uml/qmessage.cpp
@@ -291,30 +291,6 @@ void QMessage::setConnector(QConnector *connector)
     }
 }
 
-void QMessage::registerMetaTypes() const
-{
-    qRegisterMetaType<QMessageEnd *>("QMessageEnd *");
-    qRegisterMetaType<QSet<QMessageEnd *>>("QSet<QMessageEnd *>");
-    qRegisterMetaType<QList<QMessageEnd *>>("QList<QMessageEnd *>");
-
-    qRegisterMetaType<QInteraction *>("QInteraction *");
-    qRegisterMetaType<QSet<QInteraction *>>("QSet<QInteraction *>");
-    qRegisterMetaType<QList<QInteraction *>>("QList<QInteraction *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    qRegisterMetaType<QConnector *>("QConnector *");
-    qRegisterMetaType<QSet<QConnector *>>("QSet<QConnector *>");
-    qRegisterMetaType<QList<QConnector *>>("QList<QConnector *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QMessage::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QMessage")][QString::fromLatin1("messageSort")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qmessage.h b/src/uml/qmessage.h
index aa3065bf..db71c535 100644
--- a/src/uml/qmessage.h
+++ b/src/uml/qmessage.h
@@ -107,7 +107,7 @@ public:
     Q_INVOKABLE void setSendEvent(QMessageEnd *sendEvent);
     Q_INVOKABLE QConnector *connector() const;
     Q_INVOKABLE void setConnector(QConnector *connector);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qmessageend.cpp b/src/uml/qmessageend.cpp
index 4244ee22..1d102cf3 100644
--- a/src/uml/qmessageend.cpp
+++ b/src/uml/qmessageend.cpp
@@ -106,18 +106,6 @@ void QMessageEnd::setMessage(QMessage *message)
     }
 }
 
-void QMessageEnd::registerMetaTypes() const
-{
-    qRegisterMetaType<QMessage *>("QMessage *");
-    qRegisterMetaType<QSet<QMessage *>>("QSet<QMessage *>");
-    qRegisterMetaType<QList<QMessage *>>("QList<QMessage *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QMessageEnd::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QMessageEnd")][QString::fromLatin1("message")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qmessageend.h b/src/uml/qmessageend.h
index c51db3b7..d04aaed5 100644
--- a/src/uml/qmessageend.h
+++ b/src/uml/qmessageend.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QMessageEnd
     Q_INVOKABLE QMessage *message() const;
     Q_INVOKABLE void setMessage(QMessage *message);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qmessageevent.cpp b/src/uml/qmessageevent.cpp
index 5340e13e..174d5eff 100644
--- a/src/uml/qmessageevent.cpp
+++ b/src/uml/qmessageevent.cpp
@@ -78,14 +78,6 @@ QMessageEvent::~QMessageEvent()
 {
 }
 
-void QMessageEvent::registerMetaTypes() const
-{
-    QEvent::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QMessageEvent::setPropertyData()
 {
     QEvent::setPropertyData();
diff --git a/src/uml/qmessageevent.h b/src/uml/qmessageevent.h
index d51dbd81..efa03b24 100644
--- a/src/uml/qmessageevent.h
+++ b/src/uml/qmessageevent.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QMessageEvent : public QEvent
 public:
     Q_INVOKABLE explicit QMessageEvent(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QMessageEvent();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qmessageoccurrencespecification.cpp b/src/uml/qmessageoccurrencespecification.cpp
index 991176c3..1603a252 100644
--- a/src/uml/qmessageoccurrencespecification.cpp
+++ b/src/uml/qmessageoccurrencespecification.cpp
@@ -218,14 +218,6 @@ void QMessageOccurrenceSpecification::setMessage(QMessage *message)
     (qwrappedobject_cast<QMessageEnd *>(this))->setMessage(message);
 }
 
-void QMessageOccurrenceSpecification::registerMetaTypes() const
-{
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QMessageOccurrenceSpecification::setPropertyData()
 {
     QWrappedObject::setPropertyData();
diff --git a/src/uml/qmessageoccurrencespecification.h b/src/uml/qmessageoccurrencespecification.h
index 78c10a00..ef5f1f1c 100644
--- a/src/uml/qmessageoccurrencespecification.h
+++ b/src/uml/qmessageoccurrencespecification.h
@@ -93,7 +93,7 @@ public:
     // Association ends from aggregated QMessageEnd
     Q_INVOKABLE QMessage *message() const;
     Q_INVOKABLE void setMessage(QMessage *message);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qmodel.cpp b/src/uml/qmodel.cpp
index 92049881..4d86e539 100644
--- a/src/uml/qmodel.cpp
+++ b/src/uml/qmodel.cpp
@@ -103,14 +103,6 @@ void QModel::setViewpoint(QString viewpoint)
     }
 }
 
-void QModel::registerMetaTypes() const
-{
-    QPackage::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QModel::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QModel")][QString::fromLatin1("viewpoint")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qmodel.h b/src/uml/qmodel.h
index 7f7033ce..364be62d 100644
--- a/src/uml/qmodel.h
+++ b/src/uml/qmodel.h
@@ -73,7 +73,7 @@ public:
     // Attributes from QModel
     Q_INVOKABLE QString viewpoint() const;
     Q_INVOKABLE void setViewpoint(QString viewpoint);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qmultiplicityelement.cpp b/src/uml/qmultiplicityelement.cpp
index 2537dbdd..82dd71f6 100644
--- a/src/uml/qmultiplicityelement.cpp
+++ b/src/uml/qmultiplicityelement.cpp
@@ -338,18 +338,6 @@ qint32 QMultiplicityElement::upperBound() const
     return qint32(); // change here to your derived return
 }
 
-void QMultiplicityElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QMultiplicityElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QMultiplicityElement")][QString::fromLatin1("upper")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qmultiplicityelement.h b/src/uml/qmultiplicityelement.h
index e3273142..d2f4279d 100644
--- a/src/uml/qmultiplicityelement.h
+++ b/src/uml/qmultiplicityelement.h
@@ -102,7 +102,7 @@ public:
     Q_INVOKABLE bool isMultivalued() const;
     Q_INVOKABLE qint32 lowerBound() const;
     Q_INVOKABLE qint32 upperBound() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qnamedelement.cpp b/src/uml/qnamedelement.cpp
index 10d7110b..966ac43a 100644
--- a/src/uml/qnamedelement.cpp
+++ b/src/uml/qnamedelement.cpp
@@ -310,30 +310,6 @@ QString QNamedElement::separator() const
     return QStringLiteral("::");
 }
 
-void QNamedElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackage *>("QPackage *");
-    qRegisterMetaType<QSet<QPackage *>>("QSet<QPackage *>");
-    qRegisterMetaType<QList<QPackage *>>("QList<QPackage *>");
-
-    qRegisterMetaType<QNamespace *>("QNamespace *");
-    qRegisterMetaType<QSet<QNamespace *>>("QSet<QNamespace *>");
-    qRegisterMetaType<QList<QNamespace *>>("QList<QNamespace *>");
-
-    qRegisterMetaType<QDependency *>("QDependency *");
-    qRegisterMetaType<QSet<QDependency *>>("QSet<QDependency *>");
-    qRegisterMetaType<QList<QDependency *>>("QList<QDependency *>");
-
-    qRegisterMetaType<QStringExpression *>("QStringExpression *");
-    qRegisterMetaType<QSet<QStringExpression *>>("QSet<QStringExpression *>");
-    qRegisterMetaType<QList<QStringExpression *>>("QList<QStringExpression *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QNamedElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QNamedElement")][QString::fromLatin1("name")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qnamedelement.h b/src/uml/qnamedelement.h
index 53f5b409..2f2b233e 100644
--- a/src/uml/qnamedelement.h
+++ b/src/uml/qnamedelement.h
@@ -106,7 +106,7 @@ public:
     Q_INVOKABLE QSet<QPackage *> allOwningPackages() const;
     Q_INVOKABLE bool isDistinguishableFrom(const QNamedElement *n, const QNamespace *ns) const;
     Q_INVOKABLE QString separator() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qnamespace.cpp b/src/uml/qnamespace.cpp
index 22ed610f..bbfb8f3d 100644
--- a/src/uml/qnamespace.cpp
+++ b/src/uml/qnamespace.cpp
@@ -373,30 +373,6 @@ bool QNamespace::membersAreDistinguishable() const
     return bool(); // change here to your derived return
 }
 
-void QNamespace::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackageImport *>("QPackageImport *");
-    qRegisterMetaType<QSet<QPackageImport *>>("QSet<QPackageImport *>");
-    qRegisterMetaType<QList<QPackageImport *>>("QList<QPackageImport *>");
-
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QElementImport *>("QElementImport *");
-    qRegisterMetaType<QSet<QElementImport *>>("QSet<QElementImport *>");
-    qRegisterMetaType<QList<QElementImport *>>("QList<QElementImport *>");
-
-    qRegisterMetaType<QPackageableElement *>("QPackageableElement *");
-    qRegisterMetaType<QSet<QPackageableElement *>>("QSet<QPackageableElement *>");
-    qRegisterMetaType<QList<QPackageableElement *>>("QList<QPackageableElement *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QNamespace::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QNamespace")][QString::fromLatin1("packageImports")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qnamespace.h b/src/uml/qnamespace.h
index cdc15dd1..30562d5b 100644
--- a/src/uml/qnamespace.h
+++ b/src/uml/qnamespace.h
@@ -101,7 +101,7 @@ public:
     Q_INVOKABLE QSet<QString> getNamesOfMember(const QNamedElement *element) const;
     Q_INVOKABLE QSet<QPackageableElement *> importMembers(QSet<QPackageableElement *> imps) const;
     Q_INVOKABLE bool membersAreDistinguishable() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qnode.cpp b/src/uml/qnode.cpp
index db4dcdb0..6e8f9992 100644
--- a/src/uml/qnode.cpp
+++ b/src/uml/qnode.cpp
@@ -272,14 +272,6 @@ void QNode::removeNestedNode(QNode *nestedNode)
     }
 }
 
-void QNode::registerMetaTypes() const
-{
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QNode")][QString::fromLatin1("nestedNodes")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qnode.h b/src/uml/qnode.h
index 577e227f..e26335d2 100644
--- a/src/uml/qnode.h
+++ b/src/uml/qnode.h
@@ -105,7 +105,7 @@ public:
     Q_INVOKABLE QSet<QNode *> nestedNodes() const;
     Q_INVOKABLE void addNestedNode(QNode *nestedNode);
     Q_INVOKABLE void removeNestedNode(QNode *nestedNode);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qobjectflow.cpp b/src/uml/qobjectflow.cpp
index 594131ab..4e264267 100644
--- a/src/uml/qobjectflow.cpp
+++ b/src/uml/qobjectflow.cpp
@@ -192,18 +192,6 @@ void QObjectFlow::setTransformation(QBehavior *transformation)
     }
 }
 
-void QObjectFlow::registerMetaTypes() const
-{
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    QActivityEdge::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QObjectFlow::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectFlow")][QString::fromLatin1("isMultireceive")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qobjectflow.h b/src/uml/qobjectflow.h
index 3ea39aa6..a87d5905 100644
--- a/src/uml/qobjectflow.h
+++ b/src/uml/qobjectflow.h
@@ -86,7 +86,7 @@ public:
     Q_INVOKABLE void setSelection(QBehavior *selection);
     Q_INVOKABLE QBehavior *transformation() const;
     Q_INVOKABLE void setTransformation(QBehavior *transformation);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qobjectnode.cpp b/src/uml/qobjectnode.cpp
index a97fd607..35113bfe 100644
--- a/src/uml/qobjectnode.cpp
+++ b/src/uml/qobjectnode.cpp
@@ -545,26 +545,6 @@ void QObjectNode::removeInState(QState *inState)
     }
 }
 
-void QObjectNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QState *>("QState *");
-    qRegisterMetaType<QSet<QState *>>("QSet<QState *>");
-    qRegisterMetaType<QList<QState *>>("QList<QState *>");
-
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QObjectNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QObjectNode")][QString::fromLatin1("isControlType")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qobjectnode.h b/src/uml/qobjectnode.h
index 290e056e..2c5eed0b 100644
--- a/src/uml/qobjectnode.h
+++ b/src/uml/qobjectnode.h
@@ -158,7 +158,7 @@ public:
     Q_INVOKABLE QSet<QState *> inState() const;
     Q_INVOKABLE void addInState(QState *inState);
     Q_INVOKABLE void removeInState(QState *inState);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qobservation.cpp b/src/uml/qobservation.cpp
index 3ce72014..d67bf895 100644
--- a/src/uml/qobservation.cpp
+++ b/src/uml/qobservation.cpp
@@ -78,14 +78,6 @@ QObservation::~QObservation()
 {
 }
 
-void QObservation::registerMetaTypes() const
-{
-    QPackageableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QObservation::setPropertyData()
 {
     QPackageableElement::setPropertyData();
diff --git a/src/uml/qobservation.h b/src/uml/qobservation.h
index 2c5f3bd3..2b56ac30 100644
--- a/src/uml/qobservation.h
+++ b/src/uml/qobservation.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QObservation : public QPackageableElement
 public:
     Q_INVOKABLE explicit QObservation(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QObservation();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qoccurrencespecification.cpp b/src/uml/qoccurrencespecification.cpp
index b1dd3bb4..5834b721 100644
--- a/src/uml/qoccurrencespecification.cpp
+++ b/src/uml/qoccurrencespecification.cpp
@@ -181,22 +181,6 @@ void QOccurrenceSpecification::removeToBefore(QGeneralOrdering *toBefore)
     }
 }
 
-void QOccurrenceSpecification::registerMetaTypes() const
-{
-    qRegisterMetaType<QLifeline *>("QLifeline *");
-    qRegisterMetaType<QSet<QLifeline *>>("QSet<QLifeline *>");
-    qRegisterMetaType<QList<QLifeline *>>("QList<QLifeline *>");
-
-    qRegisterMetaType<QGeneralOrdering *>("QGeneralOrdering *");
-    qRegisterMetaType<QSet<QGeneralOrdering *>>("QSet<QGeneralOrdering *>");
-    qRegisterMetaType<QList<QGeneralOrdering *>>("QList<QGeneralOrdering *>");
-
-    QInteractionFragment::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QOccurrenceSpecification::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QOccurrenceSpecification")][QString::fromLatin1("covered")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qoccurrencespecification.h b/src/uml/qoccurrencespecification.h
index cdfdc833..91aa2312 100644
--- a/src/uml/qoccurrencespecification.h
+++ b/src/uml/qoccurrencespecification.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE QSet<QGeneralOrdering *> toBefore() const;
     Q_INVOKABLE void addToBefore(QGeneralOrdering *toBefore);
     Q_INVOKABLE void removeToBefore(QGeneralOrdering *toBefore);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qopaqueaction.cpp b/src/uml/qopaqueaction.cpp
index 9d102b0d..c09585c6 100644
--- a/src/uml/qopaqueaction.cpp
+++ b/src/uml/qopaqueaction.cpp
@@ -225,22 +225,6 @@ void QOpaqueAction::removeOutputValue(QOutputPin *outputValue)
     }
 }
 
-void QOpaqueAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QOpaqueAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueAction")][QString::fromLatin1("bodies")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qopaqueaction.h b/src/uml/qopaqueaction.h
index c5ff8317..571d8ddf 100644
--- a/src/uml/qopaqueaction.h
+++ b/src/uml/qopaqueaction.h
@@ -94,7 +94,7 @@ public:
     Q_INVOKABLE QSet<QOutputPin *> outputValues() const;
     Q_INVOKABLE void addOutputValue(QOutputPin *outputValue);
     Q_INVOKABLE void removeOutputValue(QOutputPin *outputValue);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qopaquebehavior.cpp b/src/uml/qopaquebehavior.cpp
index efa8230d..bd8483d5 100644
--- a/src/uml/qopaquebehavior.cpp
+++ b/src/uml/qopaquebehavior.cpp
@@ -144,14 +144,6 @@ void QOpaqueBehavior::removeBody(QString body)
     }
 }
 
-void QOpaqueBehavior::registerMetaTypes() const
-{
-    QBehavior::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QOpaqueBehavior::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueBehavior")][QString::fromLatin1("languages")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qopaquebehavior.h b/src/uml/qopaquebehavior.h
index 55582f92..83f47b4a 100644
--- a/src/uml/qopaquebehavior.h
+++ b/src/uml/qopaquebehavior.h
@@ -79,7 +79,7 @@ public:
     Q_INVOKABLE QList<QString> bodies() const;
     Q_INVOKABLE void addBody(QString body);
     Q_INVOKABLE void removeBody(QString body);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qopaqueexpression.cpp b/src/uml/qopaqueexpression.cpp
index 30068e2e..318ca4ac 100644
--- a/src/uml/qopaqueexpression.cpp
+++ b/src/uml/qopaqueexpression.cpp
@@ -225,22 +225,6 @@ qint32 QOpaqueExpression::value() const
     return qint32(); // change here to your derived return
 }
 
-void QOpaqueExpression::registerMetaTypes() const
-{
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    qRegisterMetaType<QParameter *>("QParameter *");
-    qRegisterMetaType<QSet<QParameter *>>("QSet<QParameter *>");
-    qRegisterMetaType<QList<QParameter *>>("QList<QParameter *>");
-
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QOpaqueExpression::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QOpaqueExpression")][QString::fromLatin1("bodies")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qopaqueexpression.h b/src/uml/qopaqueexpression.h
index 356ffb72..3516ec6b 100644
--- a/src/uml/qopaqueexpression.h
+++ b/src/uml/qopaqueexpression.h
@@ -96,7 +96,7 @@ public:
     Q_INVOKABLE bool isNonNegative() const;
     Q_INVOKABLE bool isPositive() const;
     Q_INVOKABLE qint32 value() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qoperation.cpp b/src/uml/qoperation.cpp
index 65461ae1..068e0313 100644
--- a/src/uml/qoperation.cpp
+++ b/src/uml/qoperation.cpp
@@ -996,46 +996,6 @@ QSet<QParameter *> QOperation::returnResult() const
     return QSet<QParameter *>(); // change here to your derived return
 }
 
-void QOperation::registerMetaTypes() const
-{
-    qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *");
-    qRegisterMetaType<QSet<QRedefinableElement *>>("QSet<QRedefinableElement *>");
-    qRegisterMetaType<QList<QRedefinableElement *>>("QList<QRedefinableElement *>");
-
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    qRegisterMetaType<QOperationTemplateParameter *>("QOperationTemplateParameter *");
-    qRegisterMetaType<QSet<QOperationTemplateParameter *>>("QSet<QOperationTemplateParameter *>");
-    qRegisterMetaType<QList<QOperationTemplateParameter *>>("QList<QOperationTemplateParameter *>");
-
-    qRegisterMetaType<QParameter *>("QParameter *");
-    qRegisterMetaType<QSet<QParameter *>>("QSet<QParameter *>");
-    qRegisterMetaType<QList<QParameter *>>("QList<QParameter *>");
-
-    qRegisterMetaType<QInterface *>("QInterface *");
-    qRegisterMetaType<QSet<QInterface *>>("QSet<QInterface *>");
-    qRegisterMetaType<QList<QInterface *>>("QList<QInterface *>");
-
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QDataType *>("QDataType *");
-    qRegisterMetaType<QSet<QDataType *>>("QSet<QDataType *>");
-    qRegisterMetaType<QList<QDataType *>>("QList<QDataType *>");
-
-    qRegisterMetaType<QClass *>("QClass *");
-    qRegisterMetaType<QSet<QClass *>>("QSet<QClass *>");
-    qRegisterMetaType<QList<QClass *>>("QList<QClass *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QOperation::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QOperation")][QString::fromLatin1("lower")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qoperation.h b/src/uml/qoperation.h
index bcb49df2..6b46b60b 100644
--- a/src/uml/qoperation.h
+++ b/src/uml/qoperation.h
@@ -220,7 +220,7 @@ public:
     // Operations
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
     Q_INVOKABLE QSet<QParameter *> returnResult() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qoperationtemplateparameter.cpp b/src/uml/qoperationtemplateparameter.cpp
index 4ef90f0d..8768b1be 100644
--- a/src/uml/qoperationtemplateparameter.cpp
+++ b/src/uml/qoperationtemplateparameter.cpp
@@ -111,18 +111,6 @@ void QOperationTemplateParameter::setParameteredElement(QOperation *parameteredE
     }
 }
 
-void QOperationTemplateParameter::registerMetaTypes() const
-{
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    QTemplateParameter::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QOperationTemplateParameter::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QOperationTemplateParameter")][QString::fromLatin1("parameteredElement")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qoperationtemplateparameter.h b/src/uml/qoperationtemplateparameter.h
index 119e3732..cb3674c2 100644
--- a/src/uml/qoperationtemplateparameter.h
+++ b/src/uml/qoperationtemplateparameter.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QOperationTemplateParameter
     Q_INVOKABLE QOperation *parameteredElement() const;
     Q_INVOKABLE void setParameteredElement(QOperation *parameteredElement);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qoutputpin.cpp b/src/uml/qoutputpin.cpp
index 183621b1..dddb8e88 100644
--- a/src/uml/qoutputpin.cpp
+++ b/src/uml/qoutputpin.cpp
@@ -78,14 +78,6 @@ QOutputPin::~QOutputPin()
 {
 }
 
-void QOutputPin::registerMetaTypes() const
-{
-    QPin::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QOutputPin::setPropertyData()
 {
     QPin::setPropertyData();
diff --git a/src/uml/qoutputpin.h b/src/uml/qoutputpin.h
index 65fc7a5f..91100ea3 100644
--- a/src/uml/qoutputpin.h
+++ b/src/uml/qoutputpin.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QOutputPin : public QPin
 public:
     Q_INVOKABLE explicit QOutputPin(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QOutputPin();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qpackage.cpp b/src/uml/qpackage.cpp
index df61a5a6..dbab93f9 100644
--- a/src/uml/qpackage.cpp
+++ b/src/uml/qpackage.cpp
@@ -705,38 +705,6 @@ QSet<QPackageableElement *> QPackage::visibleMembers() const
     return QSet<QPackageableElement *>(); // change here to your derived return
 }
 
-void QPackage::registerMetaTypes() const
-{
-    qRegisterMetaType<QProfile *>("QProfile *");
-    qRegisterMetaType<QSet<QProfile *>>("QSet<QProfile *>");
-    qRegisterMetaType<QList<QProfile *>>("QList<QProfile *>");
-
-    qRegisterMetaType<QProfileApplication *>("QProfileApplication *");
-    qRegisterMetaType<QSet<QProfileApplication *>>("QSet<QProfileApplication *>");
-    qRegisterMetaType<QList<QProfileApplication *>>("QList<QProfileApplication *>");
-
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    qRegisterMetaType<QPackageMerge *>("QPackageMerge *");
-    qRegisterMetaType<QSet<QPackageMerge *>>("QSet<QPackageMerge *>");
-    qRegisterMetaType<QList<QPackageMerge *>>("QList<QPackageMerge *>");
-
-    qRegisterMetaType<QStereotype *>("QStereotype *");
-    qRegisterMetaType<QSet<QStereotype *>>("QSet<QStereotype *>");
-    qRegisterMetaType<QList<QStereotype *>>("QList<QStereotype *>");
-
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPackage::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPackage")][QString::fromLatin1("URI")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qpackage.h b/src/uml/qpackage.h
index a040216f..9b6bfe48 100644
--- a/src/uml/qpackage.h
+++ b/src/uml/qpackage.h
@@ -181,7 +181,7 @@ public:
     Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QType> ownedType);
     Q_INVOKABLE void addPackagedElement(QWrappedObjectPointer<QPackage> nestedPackage);
     Q_INVOKABLE void removePackagedElement(QWrappedObjectPointer<QPackage> nestedPackage);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qpackageableelement.cpp b/src/uml/qpackageableelement.cpp
index 077f2f01..2aa9e698 100644
--- a/src/uml/qpackageableelement.cpp
+++ b/src/uml/qpackageableelement.cpp
@@ -252,14 +252,6 @@ void QPackageableElement::unsetVisibility()
     d->modifiedResettableProperties.removeAll(QString::fromLatin1("visibility"));
 }
 
-void QPackageableElement::registerMetaTypes() const
-{
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPackageableElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageableElement")][QString::fromLatin1("visibility")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qpackageableelement.h b/src/uml/qpackageableelement.h
index fc830c3f..e2baf8b3 100644
--- a/src/uml/qpackageableelement.h
+++ b/src/uml/qpackageableelement.h
@@ -103,7 +103,7 @@ public:
     Q_INVOKABLE QtUml::VisibilityKind visibility() const;
     Q_INVOKABLE void setVisibility(QtUml::VisibilityKind visibility);
     Q_INVOKABLE void unsetVisibility();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qpackageimport.cpp b/src/uml/qpackageimport.cpp
index 294725e3..bde8effc 100644
--- a/src/uml/qpackageimport.cpp
+++ b/src/uml/qpackageimport.cpp
@@ -188,22 +188,6 @@ void QPackageImport::setImportedPackage(QPackage *importedPackage)
     }
 }
 
-void QPackageImport::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackage *>("QPackage *");
-    qRegisterMetaType<QSet<QPackage *>>("QSet<QPackage *>");
-    qRegisterMetaType<QList<QPackage *>>("QList<QPackage *>");
-
-    qRegisterMetaType<QNamespace *>("QNamespace *");
-    qRegisterMetaType<QSet<QNamespace *>>("QSet<QNamespace *>");
-    qRegisterMetaType<QList<QNamespace *>>("QList<QNamespace *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPackageImport::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageImport")][QString::fromLatin1("visibility")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qpackageimport.h b/src/uml/qpackageimport.h
index a51aa38e..d18839be 100644
--- a/src/uml/qpackageimport.h
+++ b/src/uml/qpackageimport.h
@@ -86,7 +86,7 @@ public:
     Q_INVOKABLE void setImportingNamespace(QNamespace *importingNamespace);
     Q_INVOKABLE QPackage *importedPackage() const;
     Q_INVOKABLE void setImportedPackage(QPackage *importedPackage);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qpackagemerge.cpp b/src/uml/qpackagemerge.cpp
index 52bb34cf..559eeec3 100644
--- a/src/uml/qpackagemerge.cpp
+++ b/src/uml/qpackagemerge.cpp
@@ -153,18 +153,6 @@ void QPackageMerge::setReceivingPackage(QPackage *receivingPackage)
     }
 }
 
-void QPackageMerge::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackage *>("QPackage *");
-    qRegisterMetaType<QSet<QPackage *>>("QSet<QPackage *>");
-    qRegisterMetaType<QList<QPackage *>>("QList<QPackage *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPackageMerge::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPackageMerge")][QString::fromLatin1("mergedPackage")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qpackagemerge.h b/src/uml/qpackagemerge.h
index 364a8452..aadc3e97 100644
--- a/src/uml/qpackagemerge.h
+++ b/src/uml/qpackagemerge.h
@@ -76,7 +76,7 @@ public:
     Q_INVOKABLE void setMergedPackage(QPackage *mergedPackage);
     Q_INVOKABLE QPackage *receivingPackage() const;
     Q_INVOKABLE void setReceivingPackage(QPackage *receivingPackage);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qparameter.cpp b/src/uml/qparameter.cpp
index b4a9a5b0..edb495ce 100644
--- a/src/uml/qparameter.cpp
+++ b/src/uml/qparameter.cpp
@@ -615,26 +615,6 @@ void QParameter::removeParameterSet(QParameterSet *parameterSet)
     }
 }
 
-void QParameter::registerMetaTypes() const
-{
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    qRegisterMetaType<QParameterSet *>("QParameterSet *");
-    qRegisterMetaType<QSet<QParameterSet *>>("QSet<QParameterSet *>");
-    qRegisterMetaType<QList<QParameterSet *>>("QList<QParameterSet *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QParameter::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QParameter")][QString::fromLatin1("isException")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qparameter.h b/src/uml/qparameter.h
index 5f7e1150..9b02e19e 100644
--- a/src/uml/qparameter.h
+++ b/src/uml/qparameter.h
@@ -167,7 +167,7 @@ public:
     Q_INVOKABLE QSet<QParameterSet *> parameterSets() const;
     Q_INVOKABLE void addParameterSet(QParameterSet *parameterSet);
     Q_INVOKABLE void removeParameterSet(QParameterSet *parameterSet);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qparameterableelement.cpp b/src/uml/qparameterableelement.cpp
index e3db3c57..9b74e3ae 100644
--- a/src/uml/qparameterableelement.cpp
+++ b/src/uml/qparameterableelement.cpp
@@ -163,18 +163,6 @@ bool QParameterableElement::isTemplateParameter() const
     return bool(); // change here to your derived return
 }
 
-void QParameterableElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QTemplateParameter *>("QTemplateParameter *");
-    qRegisterMetaType<QSet<QTemplateParameter *>>("QSet<QTemplateParameter *>");
-    qRegisterMetaType<QList<QTemplateParameter *>>("QList<QTemplateParameter *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QParameterableElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterableElement")][QString::fromLatin1("owningTemplateParameter")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qparameterableelement.h b/src/uml/qparameterableelement.h
index 59931c04..9a258131 100644
--- a/src/uml/qparameterableelement.h
+++ b/src/uml/qparameterableelement.h
@@ -80,7 +80,7 @@ public:
     // Operations
     Q_INVOKABLE bool isCompatibleWith(const QParameterableElement *p) const;
     Q_INVOKABLE bool isTemplateParameter() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qparameterset.cpp b/src/uml/qparameterset.cpp
index 9ff880b8..34ef4586 100644
--- a/src/uml/qparameterset.cpp
+++ b/src/uml/qparameterset.cpp
@@ -160,22 +160,6 @@ void QParameterSet::removeCondition(QConstraint *condition)
     }
 }
 
-void QParameterSet::registerMetaTypes() const
-{
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QParameter *>("QParameter *");
-    qRegisterMetaType<QSet<QParameter *>>("QSet<QParameter *>");
-    qRegisterMetaType<QList<QParameter *>>("QList<QParameter *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QParameterSet::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QParameterSet")][QString::fromLatin1("parameters")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qparameterset.h b/src/uml/qparameterset.h
index 6b558739..7cd2c1f7 100644
--- a/src/uml/qparameterset.h
+++ b/src/uml/qparameterset.h
@@ -82,7 +82,7 @@ public:
     Q_INVOKABLE QSet<QConstraint *> conditions() const;
     Q_INVOKABLE void addCondition(QConstraint *condition);
     Q_INVOKABLE void removeCondition(QConstraint *condition);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qpartdecomposition.cpp b/src/uml/qpartdecomposition.cpp
index c5302fec..80c1e2a0 100644
--- a/src/uml/qpartdecomposition.cpp
+++ b/src/uml/qpartdecomposition.cpp
@@ -78,14 +78,6 @@ QPartDecomposition::~QPartDecomposition()
 {
 }
 
-void QPartDecomposition::registerMetaTypes() const
-{
-    QInteractionUse::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPartDecomposition::setPropertyData()
 {
     QInteractionUse::setPropertyData();
diff --git a/src/uml/qpartdecomposition.h b/src/uml/qpartdecomposition.h
index 28607409..44d26208 100644
--- a/src/uml/qpartdecomposition.h
+++ b/src/uml/qpartdecomposition.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QPartDecomposition : public QInteractionUse
 public:
     Q_INVOKABLE explicit QPartDecomposition(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QPartDecomposition();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qpin.cpp b/src/uml/qpin.cpp
index 30a551f9..4e1070f5 100644
--- a/src/uml/qpin.cpp
+++ b/src/uml/qpin.cpp
@@ -623,14 +623,6 @@ void QPin::unsetControl()
     d->modifiedResettableProperties.removeAll(QString::fromLatin1("isControl"));
 }
 
-void QPin::registerMetaTypes() const
-{
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPin::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPin")][QString::fromLatin1("isControl")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qpin.h b/src/uml/qpin.h
index ad7ca637..9dffcd16 100644
--- a/src/uml/qpin.h
+++ b/src/uml/qpin.h
@@ -167,7 +167,7 @@ public:
     Q_INVOKABLE bool isControl() const;
     Q_INVOKABLE void setControl(bool isControl);
     Q_INVOKABLE void unsetControl();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qport.cpp b/src/uml/qport.cpp
index 28ce6c73..409f433b 100644
--- a/src/uml/qport.cpp
+++ b/src/uml/qport.cpp
@@ -262,22 +262,6 @@ void QPort::removeRedefinedPort(QPort *redefinedPort)
     }
 }
 
-void QPort::registerMetaTypes() const
-{
-    qRegisterMetaType<QProtocolStateMachine *>("QProtocolStateMachine *");
-    qRegisterMetaType<QSet<QProtocolStateMachine *>>("QSet<QProtocolStateMachine *>");
-    qRegisterMetaType<QList<QProtocolStateMachine *>>("QList<QProtocolStateMachine *>");
-
-    qRegisterMetaType<QInterface *>("QInterface *");
-    qRegisterMetaType<QSet<QInterface *>>("QSet<QInterface *>");
-    qRegisterMetaType<QList<QInterface *>>("QList<QInterface *>");
-
-    QProperty::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPort::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPort")][QString::fromLatin1("isConjugated")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qport.h b/src/uml/qport.h
index 72ef40aa..5b99f638 100644
--- a/src/uml/qport.h
+++ b/src/uml/qport.h
@@ -106,7 +106,7 @@ public:
     // Overriden methods for subsetted properties
     Q_INVOKABLE void addRedefinedProperty(QWrappedObjectPointer<QPort> redefinedPort);
     Q_INVOKABLE void removeRedefinedProperty(QWrappedObjectPointer<QPort> redefinedPort);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qprimitivetype.cpp b/src/uml/qprimitivetype.cpp
index 509ae1fb..cb4f19f3 100644
--- a/src/uml/qprimitivetype.cpp
+++ b/src/uml/qprimitivetype.cpp
@@ -78,14 +78,6 @@ QPrimitiveType::~QPrimitiveType()
 {
 }
 
-void QPrimitiveType::registerMetaTypes() const
-{
-    QDataType::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPrimitiveType::setPropertyData()
 {
     QDataType::setPropertyData();
diff --git a/src/uml/qprimitivetype.h b/src/uml/qprimitivetype.h
index 54047e0f..b26b8508 100644
--- a/src/uml/qprimitivetype.h
+++ b/src/uml/qprimitivetype.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QPrimitiveType : public QDataType
 public:
     Q_INVOKABLE explicit QPrimitiveType(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QPrimitiveType();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qprofile.cpp b/src/uml/qprofile.cpp
index abf033f9..5699cef2 100644
--- a/src/uml/qprofile.cpp
+++ b/src/uml/qprofile.cpp
@@ -159,22 +159,6 @@ void QProfile::removeMetaclassReference(QElementImport *metaclassReference)
     }
 }
 
-void QProfile::registerMetaTypes() const
-{
-    qRegisterMetaType<QElementImport *>("QElementImport *");
-    qRegisterMetaType<QSet<QElementImport *>>("QSet<QElementImport *>");
-    qRegisterMetaType<QList<QElementImport *>>("QList<QElementImport *>");
-
-    qRegisterMetaType<QPackageImport *>("QPackageImport *");
-    qRegisterMetaType<QSet<QPackageImport *>>("QSet<QPackageImport *>");
-    qRegisterMetaType<QList<QPackageImport *>>("QList<QPackageImport *>");
-
-    QPackage::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QProfile::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QProfile")][QString::fromLatin1("metamodelReferences")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qprofile.h b/src/uml/qprofile.h
index 930ebe9f..f9fff573 100644
--- a/src/uml/qprofile.h
+++ b/src/uml/qprofile.h
@@ -82,7 +82,7 @@ public:
     Q_INVOKABLE QSet<QElementImport *> metaclassReferences() const;
     Q_INVOKABLE void addMetaclassReference(QElementImport *metaclassReference);
     Q_INVOKABLE void removeMetaclassReference(QElementImport *metaclassReference);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qprofileapplication.cpp b/src/uml/qprofileapplication.cpp
index 052320a0..1feb5923 100644
--- a/src/uml/qprofileapplication.cpp
+++ b/src/uml/qprofileapplication.cpp
@@ -188,22 +188,6 @@ void QProfileApplication::setAppliedProfile(QProfile *appliedProfile)
     }
 }
 
-void QProfileApplication::registerMetaTypes() const
-{
-    qRegisterMetaType<QProfile *>("QProfile *");
-    qRegisterMetaType<QSet<QProfile *>>("QSet<QProfile *>");
-    qRegisterMetaType<QList<QProfile *>>("QList<QProfile *>");
-
-    qRegisterMetaType<QPackage *>("QPackage *");
-    qRegisterMetaType<QSet<QPackage *>>("QSet<QPackage *>");
-    qRegisterMetaType<QList<QPackage *>>("QList<QPackage *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QProfileApplication::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QProfileApplication")][QString::fromLatin1("isStrict")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qprofileapplication.h b/src/uml/qprofileapplication.h
index 76679923..5605f0c0 100644
--- a/src/uml/qprofileapplication.h
+++ b/src/uml/qprofileapplication.h
@@ -83,7 +83,7 @@ public:
     Q_INVOKABLE void setApplyingPackage(QPackage *applyingPackage);
     Q_INVOKABLE QProfile *appliedProfile() const;
     Q_INVOKABLE void setAppliedProfile(QProfile *appliedProfile);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qproperty.cpp b/src/uml/qproperty.cpp
index 196d5c94..95dec0e0 100644
--- a/src/uml/qproperty.cpp
+++ b/src/uml/qproperty.cpp
@@ -1155,46 +1155,6 @@ QSet<QType *> QProperty::subsettingContext() const
     return QSet<QType *>(); // change here to your derived return
 }
 
-void QProperty::registerMetaTypes() const
-{
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    qRegisterMetaType<QInterface *>("QInterface *");
-    qRegisterMetaType<QSet<QInterface *>>("QSet<QInterface *>");
-    qRegisterMetaType<QList<QInterface *>>("QList<QInterface *>");
-
-    qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *");
-    qRegisterMetaType<QSet<QRedefinableElement *>>("QSet<QRedefinableElement *>");
-    qRegisterMetaType<QList<QRedefinableElement *>>("QList<QRedefinableElement *>");
-
-    qRegisterMetaType<QParameterableElement *>("QParameterableElement *");
-    qRegisterMetaType<QSet<QParameterableElement *>>("QSet<QParameterableElement *>");
-    qRegisterMetaType<QList<QParameterableElement *>>("QList<QParameterableElement *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    qRegisterMetaType<QDataType *>("QDataType *");
-    qRegisterMetaType<QSet<QDataType *>>("QSet<QDataType *>");
-    qRegisterMetaType<QList<QDataType *>>("QList<QDataType *>");
-
-    qRegisterMetaType<QAssociation *>("QAssociation *");
-    qRegisterMetaType<QSet<QAssociation *>>("QSet<QAssociation *>");
-    qRegisterMetaType<QList<QAssociation *>>("QList<QAssociation *>");
-
-    qRegisterMetaType<QClass *>("QClass *");
-    qRegisterMetaType<QSet<QClass *>>("QSet<QClass *>");
-    qRegisterMetaType<QList<QClass *>>("QList<QClass *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QProperty::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QProperty")][QString::fromLatin1("isDerived")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qproperty.h b/src/uml/qproperty.h
index 14f3f984..6f023c10 100644
--- a/src/uml/qproperty.h
+++ b/src/uml/qproperty.h
@@ -238,7 +238,7 @@ public:
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
     Q_INVOKABLE bool isNavigable() const;
     Q_INVOKABLE QSet<QType *> subsettingContext() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qprotocolconformance.cpp b/src/uml/qprotocolconformance.cpp
index a953392b..a8c200c1 100644
--- a/src/uml/qprotocolconformance.cpp
+++ b/src/uml/qprotocolconformance.cpp
@@ -153,18 +153,6 @@ void QProtocolConformance::setGeneralMachine(QProtocolStateMachine *generalMachi
     }
 }
 
-void QProtocolConformance::registerMetaTypes() const
-{
-    qRegisterMetaType<QProtocolStateMachine *>("QProtocolStateMachine *");
-    qRegisterMetaType<QSet<QProtocolStateMachine *>>("QSet<QProtocolStateMachine *>");
-    qRegisterMetaType<QList<QProtocolStateMachine *>>("QList<QProtocolStateMachine *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QProtocolConformance::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolConformance")][QString::fromLatin1("specificMachine")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qprotocolconformance.h b/src/uml/qprotocolconformance.h
index e1f97e29..48ce46bf 100644
--- a/src/uml/qprotocolconformance.h
+++ b/src/uml/qprotocolconformance.h
@@ -76,7 +76,7 @@ public:
     Q_INVOKABLE void setSpecificMachine(QProtocolStateMachine *specificMachine);
     Q_INVOKABLE QProtocolStateMachine *generalMachine() const;
     Q_INVOKABLE void setGeneralMachine(QProtocolStateMachine *generalMachine);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qprotocolstatemachine.cpp b/src/uml/qprotocolstatemachine.cpp
index dc6bdbaf..4e2598db 100644
--- a/src/uml/qprotocolstatemachine.cpp
+++ b/src/uml/qprotocolstatemachine.cpp
@@ -127,18 +127,6 @@ void QProtocolStateMachine::removeConformance(QProtocolConformance *conformance)
     }
 }
 
-void QProtocolStateMachine::registerMetaTypes() const
-{
-    qRegisterMetaType<QProtocolConformance *>("QProtocolConformance *");
-    qRegisterMetaType<QSet<QProtocolConformance *>>("QSet<QProtocolConformance *>");
-    qRegisterMetaType<QList<QProtocolConformance *>>("QList<QProtocolConformance *>");
-
-    QStateMachine::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QProtocolStateMachine::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolStateMachine")][QString::fromLatin1("conformance")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qprotocolstatemachine.h b/src/uml/qprotocolstatemachine.h
index 99ecbe27..eb15753c 100644
--- a/src/uml/qprotocolstatemachine.h
+++ b/src/uml/qprotocolstatemachine.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE QSet<QProtocolConformance *> conformance() const;
     Q_INVOKABLE void addConformance(QProtocolConformance *conformance);
     Q_INVOKABLE void removeConformance(QProtocolConformance *conformance);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qprotocoltransition.cpp b/src/uml/qprotocoltransition.cpp
index 8b589a7d..ba84844a 100644
--- a/src/uml/qprotocoltransition.cpp
+++ b/src/uml/qprotocoltransition.cpp
@@ -152,22 +152,6 @@ void QProtocolTransition::setPreCondition(QConstraint *preCondition)
     }
 }
 
-void QProtocolTransition::registerMetaTypes() const
-{
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QOperation *>("QOperation *");
-    qRegisterMetaType<QSet<QOperation *>>("QSet<QOperation *>");
-    qRegisterMetaType<QList<QOperation *>>("QList<QOperation *>");
-
-    QTransition::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QProtocolTransition::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QProtocolTransition")][QString::fromLatin1("postCondition")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qprotocoltransition.h b/src/uml/qprotocoltransition.h
index cf7f5bb1..d2042dd4 100644
--- a/src/uml/qprotocoltransition.h
+++ b/src/uml/qprotocoltransition.h
@@ -82,7 +82,7 @@ public:
     Q_INVOKABLE QSet<QOperation *> referred() const;
     Q_INVOKABLE QConstraint *preCondition() const;
     Q_INVOKABLE void setPreCondition(QConstraint *preCondition);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qpseudostate.cpp b/src/uml/qpseudostate.cpp
index e2ebff7f..9073e81a 100644
--- a/src/uml/qpseudostate.cpp
+++ b/src/uml/qpseudostate.cpp
@@ -185,22 +185,6 @@ void QPseudostate::setStateMachine(QStateMachine *stateMachine)
     }
 }
 
-void QPseudostate::registerMetaTypes() const
-{
-    qRegisterMetaType<QState *>("QState *");
-    qRegisterMetaType<QSet<QState *>>("QSet<QState *>");
-    qRegisterMetaType<QList<QState *>>("QList<QState *>");
-
-    qRegisterMetaType<QStateMachine *>("QStateMachine *");
-    qRegisterMetaType<QSet<QStateMachine *>>("QSet<QStateMachine *>");
-    qRegisterMetaType<QList<QStateMachine *>>("QList<QStateMachine *>");
-
-    QVertex::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QPseudostate::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QPseudostate")][QString::fromLatin1("kind")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qpseudostate.h b/src/uml/qpseudostate.h
index 672690a7..610171b8 100644
--- a/src/uml/qpseudostate.h
+++ b/src/uml/qpseudostate.h
@@ -86,7 +86,7 @@ public:
     Q_INVOKABLE void setState(QState *state);
     Q_INVOKABLE QStateMachine *stateMachine() const;
     Q_INVOKABLE void setStateMachine(QStateMachine *stateMachine);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qqualifiervalue.cpp b/src/uml/qqualifiervalue.cpp
index b904fe45..5431d688 100644
--- a/src/uml/qqualifiervalue.cpp
+++ b/src/uml/qqualifiervalue.cpp
@@ -129,22 +129,6 @@ void QQualifierValue::setQualifier(QProperty *qualifier)
     }
 }
 
-void QQualifierValue::registerMetaTypes() const
-{
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QQualifierValue::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QQualifierValue")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qqualifiervalue.h b/src/uml/qqualifiervalue.h
index da48cd15..dfd212b0 100644
--- a/src/uml/qqualifiervalue.h
+++ b/src/uml/qqualifiervalue.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setValue(QInputPin *value);
     Q_INVOKABLE QProperty *qualifier() const;
     Q_INVOKABLE void setQualifier(QProperty *qualifier);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qraiseexceptionaction.cpp b/src/uml/qraiseexceptionaction.cpp
index c2ec4959..831fd603 100644
--- a/src/uml/qraiseexceptionaction.cpp
+++ b/src/uml/qraiseexceptionaction.cpp
@@ -114,18 +114,6 @@ void QRaiseExceptionAction::setException(QInputPin *exception)
     }
 }
 
-void QRaiseExceptionAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QRaiseExceptionAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QRaiseExceptionAction")][QString::fromLatin1("exception")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qraiseexceptionaction.h b/src/uml/qraiseexceptionaction.h
index d9d5195c..242aed04 100644
--- a/src/uml/qraiseexceptionaction.h
+++ b/src/uml/qraiseexceptionaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QRaiseExceptionAction
     Q_INVOKABLE QInputPin *exception() const;
     Q_INVOKABLE void setException(QInputPin *exception);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreadextentaction.cpp b/src/uml/qreadextentaction.cpp
index 2ff6624b..36fe1ce9 100644
--- a/src/uml/qreadextentaction.cpp
+++ b/src/uml/qreadextentaction.cpp
@@ -137,22 +137,6 @@ void QReadExtentAction::setResult(QOutputPin *result)
     }
 }
 
-void QReadExtentAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReadExtentAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReadExtentAction")][QString::fromLatin1("classifier")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qreadextentaction.h b/src/uml/qreadextentaction.h
index b745535d..ef172ef2 100644
--- a/src/uml/qreadextentaction.h
+++ b/src/uml/qreadextentaction.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setClassifier(QClassifier *classifier);
     Q_INVOKABLE QOutputPin *result() const;
     Q_INVOKABLE void setResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreadisclassifiedobjectaction.cpp b/src/uml/qreadisclassifiedobjectaction.cpp
index a2363404..154078de 100644
--- a/src/uml/qreadisclassifiedobjectaction.cpp
+++ b/src/uml/qreadisclassifiedobjectaction.cpp
@@ -202,26 +202,6 @@ void QReadIsClassifiedObjectAction::setClassifier(QClassifier *classifier)
     }
 }
 
-void QReadIsClassifiedObjectAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReadIsClassifiedObjectAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReadIsClassifiedObjectAction")][QString::fromLatin1("isDirect")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qreadisclassifiedobjectaction.h b/src/uml/qreadisclassifiedobjectaction.h
index c01344c0..5ebe0a64 100644
--- a/src/uml/qreadisclassifiedobjectaction.h
+++ b/src/uml/qreadisclassifiedobjectaction.h
@@ -87,7 +87,7 @@ public:
     Q_INVOKABLE void setObject(QInputPin *object);
     Q_INVOKABLE QClassifier *classifier() const;
     Q_INVOKABLE void setClassifier(QClassifier *classifier);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreadlinkaction.cpp b/src/uml/qreadlinkaction.cpp
index f55ab68e..e5cf4f53 100644
--- a/src/uml/qreadlinkaction.cpp
+++ b/src/uml/qreadlinkaction.cpp
@@ -114,18 +114,6 @@ void QReadLinkAction::setResult(QOutputPin *result)
     }
 }
 
-void QReadLinkAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QLinkAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReadLinkAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkAction")][QString::fromLatin1("result")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qreadlinkaction.h b/src/uml/qreadlinkaction.h
index 898e95d8..1ddda262 100644
--- a/src/uml/qreadlinkaction.h
+++ b/src/uml/qreadlinkaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QReadLinkAction
     Q_INVOKABLE QOutputPin *result() const;
     Q_INVOKABLE void setResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreadlinkobjectendaction.cpp b/src/uml/qreadlinkobjectendaction.cpp
index 24650632..8c30c46a 100644
--- a/src/uml/qreadlinkobjectendaction.cpp
+++ b/src/uml/qreadlinkobjectendaction.cpp
@@ -168,26 +168,6 @@ void QReadLinkObjectEndAction::setResult(QOutputPin *result)
     }
 }
 
-void QReadLinkObjectEndAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReadLinkObjectEndAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndAction")][QString::fromLatin1("end")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qreadlinkobjectendaction.h b/src/uml/qreadlinkobjectendaction.h
index bbe28da5..6bf7efc9 100644
--- a/src/uml/qreadlinkobjectendaction.h
+++ b/src/uml/qreadlinkobjectendaction.h
@@ -81,7 +81,7 @@ public:
     Q_INVOKABLE void setObject(QInputPin *object);
     Q_INVOKABLE QOutputPin *result() const;
     Q_INVOKABLE void setResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreadlinkobjectendqualifieraction.cpp b/src/uml/qreadlinkobjectendqualifieraction.cpp
index 99f3b5c0..e3ed0d57 100644
--- a/src/uml/qreadlinkobjectendqualifieraction.cpp
+++ b/src/uml/qreadlinkobjectendqualifieraction.cpp
@@ -168,26 +168,6 @@ void QReadLinkObjectEndQualifierAction::setQualifier(QProperty *qualifier)
     }
 }
 
-void QReadLinkObjectEndQualifierAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReadLinkObjectEndQualifierAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReadLinkObjectEndQualifierAction")][QString::fromLatin1("result")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qreadlinkobjectendqualifieraction.h b/src/uml/qreadlinkobjectendqualifieraction.h
index 35f40d63..16fcbd92 100644
--- a/src/uml/qreadlinkobjectendqualifieraction.h
+++ b/src/uml/qreadlinkobjectendqualifieraction.h
@@ -81,7 +81,7 @@ public:
     Q_INVOKABLE void setObject(QInputPin *object);
     Q_INVOKABLE QProperty *qualifier() const;
     Q_INVOKABLE void setQualifier(QProperty *qualifier);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreadselfaction.cpp b/src/uml/qreadselfaction.cpp
index 2e5cb369..f9ce8cb5 100644
--- a/src/uml/qreadselfaction.cpp
+++ b/src/uml/qreadselfaction.cpp
@@ -114,18 +114,6 @@ void QReadSelfAction::setResult(QOutputPin *result)
     }
 }
 
-void QReadSelfAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReadSelfAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReadSelfAction")][QString::fromLatin1("result")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qreadselfaction.h b/src/uml/qreadselfaction.h
index 799336c6..4f15e86e 100644
--- a/src/uml/qreadselfaction.h
+++ b/src/uml/qreadselfaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QReadSelfAction
     Q_INVOKABLE QOutputPin *result() const;
     Q_INVOKABLE void setResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreadstructuralfeatureaction.cpp b/src/uml/qreadstructuralfeatureaction.cpp
index 21ed42f7..3f6a6ac0 100644
--- a/src/uml/qreadstructuralfeatureaction.cpp
+++ b/src/uml/qreadstructuralfeatureaction.cpp
@@ -114,18 +114,6 @@ void QReadStructuralFeatureAction::setResult(QOutputPin *result)
     }
 }
 
-void QReadStructuralFeatureAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QStructuralFeatureAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReadStructuralFeatureAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReadStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qreadstructuralfeatureaction.h b/src/uml/qreadstructuralfeatureaction.h
index b6de84d4..a98a3e02 100644
--- a/src/uml/qreadstructuralfeatureaction.h
+++ b/src/uml/qreadstructuralfeatureaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QReadStructuralFeatureAction
     Q_INVOKABLE QOutputPin *result() const;
     Q_INVOKABLE void setResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreadvariableaction.cpp b/src/uml/qreadvariableaction.cpp
index f28e78e7..0e4b5949 100644
--- a/src/uml/qreadvariableaction.cpp
+++ b/src/uml/qreadvariableaction.cpp
@@ -114,18 +114,6 @@ void QReadVariableAction::setResult(QOutputPin *result)
     }
 }
 
-void QReadVariableAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QVariableAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReadVariableAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReadVariableAction")][QString::fromLatin1("result")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qreadvariableaction.h b/src/uml/qreadvariableaction.h
index 0e453b9c..3039f648 100644
--- a/src/uml/qreadvariableaction.h
+++ b/src/uml/qreadvariableaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QReadVariableAction
     Q_INVOKABLE QOutputPin *result() const;
     Q_INVOKABLE void setResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qrealization.cpp b/src/uml/qrealization.cpp
index c5831cd6..871ca806 100644
--- a/src/uml/qrealization.cpp
+++ b/src/uml/qrealization.cpp
@@ -78,14 +78,6 @@ QRealization::~QRealization()
 {
 }
 
-void QRealization::registerMetaTypes() const
-{
-    QAbstraction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QRealization::setPropertyData()
 {
     QAbstraction::setPropertyData();
diff --git a/src/uml/qrealization.h b/src/uml/qrealization.h
index c4a89d0d..1a71289a 100644
--- a/src/uml/qrealization.h
+++ b/src/uml/qrealization.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QRealization : public QAbstraction
 public:
     Q_INVOKABLE explicit QRealization(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QRealization();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreception.cpp b/src/uml/qreception.cpp
index e9ead756..cf7b75a1 100644
--- a/src/uml/qreception.cpp
+++ b/src/uml/qreception.cpp
@@ -106,18 +106,6 @@ void QReception::setSignal(QSignal *signal)
     }
 }
 
-void QReception::registerMetaTypes() const
-{
-    qRegisterMetaType<QSignal *>("QSignal *");
-    qRegisterMetaType<QSet<QSignal *>>("QSet<QSignal *>");
-    qRegisterMetaType<QList<QSignal *>>("QList<QSignal *>");
-
-    QBehavioralFeature::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReception::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReception")][QString::fromLatin1("signal")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qreception.h b/src/uml/qreception.h
index f1a6f0b8..0d8e8e09 100644
--- a/src/uml/qreception.h
+++ b/src/uml/qreception.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QReception
     Q_INVOKABLE QSignal *signal() const;
     Q_INVOKABLE void setSignal(QSignal *signal);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreclassifyobjectaction.cpp b/src/uml/qreclassifyobjectaction.cpp
index 15bc3697..f48ba2a8 100644
--- a/src/uml/qreclassifyobjectaction.cpp
+++ b/src/uml/qreclassifyobjectaction.cpp
@@ -211,22 +211,6 @@ void QReclassifyObjectAction::removeNewClassifier(QClassifier *newClassifier)
     }
 }
 
-void QReclassifyObjectAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReclassifyObjectAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReclassifyObjectAction")][QString::fromLatin1("isReplaceAll")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qreclassifyobjectaction.h b/src/uml/qreclassifyobjectaction.h
index 4b4aad3e..933fce6a 100644
--- a/src/uml/qreclassifyobjectaction.h
+++ b/src/uml/qreclassifyobjectaction.h
@@ -91,7 +91,7 @@ public:
     Q_INVOKABLE QSet<QClassifier *> newClassifiers() const;
     Q_INVOKABLE void addNewClassifier(QClassifier *newClassifier);
     Q_INVOKABLE void removeNewClassifier(QClassifier *newClassifier);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qredefinableelement.cpp b/src/uml/qredefinableelement.cpp
index 9a0bb6b9..2ea07491 100644
--- a/src/uml/qredefinableelement.cpp
+++ b/src/uml/qredefinableelement.cpp
@@ -198,18 +198,6 @@ bool QRedefinableElement::isRedefinitionContextValid(const QRedefinableElement *
     return bool(); // change here to your derived return
 }
 
-void QRedefinableElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QRedefinableElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableElement")][QString::fromLatin1("isLeaf")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qredefinableelement.h b/src/uml/qredefinableelement.h
index 50172a3a..b4aaa064 100644
--- a/src/uml/qredefinableelement.h
+++ b/src/uml/qredefinableelement.h
@@ -87,7 +87,7 @@ public:
     // Operations
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
     Q_INVOKABLE bool isRedefinitionContextValid(const QRedefinableElement *redefined) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qredefinabletemplatesignature.cpp b/src/uml/qredefinabletemplatesignature.cpp
index 6156cc56..ee8849e1 100644
--- a/src/uml/qredefinabletemplatesignature.cpp
+++ b/src/uml/qredefinabletemplatesignature.cpp
@@ -347,22 +347,6 @@ bool QRedefinableTemplateSignature::isConsistentWith(const QRedefinableElement *
     return bool(); // change here to your derived return
 }
 
-void QRedefinableTemplateSignature::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QTemplateParameter *>("QTemplateParameter *");
-    qRegisterMetaType<QSet<QTemplateParameter *>>("QSet<QTemplateParameter *>");
-    qRegisterMetaType<QList<QTemplateParameter *>>("QList<QTemplateParameter *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QRedefinableTemplateSignature::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QRedefinableTemplateSignature")][QString::fromLatin1("inheritedParameters")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qredefinabletemplatesignature.h b/src/uml/qredefinabletemplatesignature.h
index e160c622..8d595a82 100644
--- a/src/uml/qredefinabletemplatesignature.h
+++ b/src/uml/qredefinabletemplatesignature.h
@@ -120,7 +120,7 @@ public:
 
     // Operations
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreduceaction.cpp b/src/uml/qreduceaction.cpp
index 075a57d5..c8929b6a 100644
--- a/src/uml/qreduceaction.cpp
+++ b/src/uml/qreduceaction.cpp
@@ -202,26 +202,6 @@ void QReduceAction::setReducer(QBehavior *reducer)
     }
 }
 
-void QReduceAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReduceAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReduceAction")][QString::fromLatin1("isOrdered")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qreduceaction.h b/src/uml/qreduceaction.h
index e66cf534..380c0cc1 100644
--- a/src/uml/qreduceaction.h
+++ b/src/uml/qreduceaction.h
@@ -87,7 +87,7 @@ public:
     Q_INVOKABLE void setCollection(QInputPin *collection);
     Q_INVOKABLE QBehavior *reducer() const;
     Q_INVOKABLE void setReducer(QBehavior *reducer);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qregion.cpp b/src/uml/qregion.cpp
index 5ede4af1..ecb4befb 100644
--- a/src/uml/qregion.cpp
+++ b/src/uml/qregion.cpp
@@ -565,34 +565,6 @@ bool QRegion::isRedefinitionContextValid(const QRegion *redefined) const
     return bool(); // change here to your derived return
 }
 
-void QRegion::registerMetaTypes() const
-{
-    qRegisterMetaType<QVertex *>("QVertex *");
-    qRegisterMetaType<QSet<QVertex *>>("QSet<QVertex *>");
-    qRegisterMetaType<QList<QVertex *>>("QList<QVertex *>");
-
-    qRegisterMetaType<QTransition *>("QTransition *");
-    qRegisterMetaType<QSet<QTransition *>>("QSet<QTransition *>");
-    qRegisterMetaType<QList<QTransition *>>("QList<QTransition *>");
-
-    qRegisterMetaType<QStateMachine *>("QStateMachine *");
-    qRegisterMetaType<QSet<QStateMachine *>>("QSet<QStateMachine *>");
-    qRegisterMetaType<QList<QStateMachine *>>("QList<QStateMachine *>");
-
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QState *>("QState *");
-    qRegisterMetaType<QSet<QState *>>("QSet<QState *>");
-    qRegisterMetaType<QList<QState *>>("QList<QState *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QRegion::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QRegion")][QString::fromLatin1("extendedRegion")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qregion.h b/src/uml/qregion.h
index 501e37b6..970cce1e 100644
--- a/src/uml/qregion.h
+++ b/src/uml/qregion.h
@@ -149,7 +149,7 @@ public:
     Q_INVOKABLE QStateMachine *containingStateMachine() const;
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
     Q_INVOKABLE bool isRedefinitionContextValid(const QRegion *redefined) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qrelationship.cpp b/src/uml/qrelationship.cpp
index d3b7ff03..f67d9740 100644
--- a/src/uml/qrelationship.cpp
+++ b/src/uml/qrelationship.cpp
@@ -111,14 +111,6 @@ QSet<QElement *> QRelationship::relatedElements() const
     return d->relatedElements;
 }
 
-void QRelationship::registerMetaTypes() const
-{
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QRelationship::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QRelationship")][QString::fromLatin1("relatedElements")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qrelationship.h b/src/uml/qrelationship.h
index 337cb1b9..4c153a90 100644
--- a/src/uml/qrelationship.h
+++ b/src/uml/qrelationship.h
@@ -72,7 +72,7 @@ public:
 
     // Association ends from QRelationship
     Q_INVOKABLE QSet<QElement *> relatedElements() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qremovestructuralfeaturevalueaction.cpp b/src/uml/qremovestructuralfeaturevalueaction.cpp
index 1018d71c..99a668e0 100644
--- a/src/uml/qremovestructuralfeaturevalueaction.cpp
+++ b/src/uml/qremovestructuralfeaturevalueaction.cpp
@@ -148,18 +148,6 @@ void QRemoveStructuralFeatureValueAction::setRemoveAt(QInputPin *removeAt)
     }
 }
 
-void QRemoveStructuralFeatureValueAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QWriteStructuralFeatureAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QRemoveStructuralFeatureValueAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveStructuralFeatureValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qremovestructuralfeaturevalueaction.h b/src/uml/qremovestructuralfeaturevalueaction.h
index d51950c7..bfd5aec6 100644
--- a/src/uml/qremovestructuralfeaturevalueaction.h
+++ b/src/uml/qremovestructuralfeaturevalueaction.h
@@ -79,7 +79,7 @@ public:
     // Association ends from QRemoveStructuralFeatureValueAction
     Q_INVOKABLE QInputPin *removeAt() const;
     Q_INVOKABLE void setRemoveAt(QInputPin *removeAt);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qremovevariablevalueaction.cpp b/src/uml/qremovevariablevalueaction.cpp
index d1409658..f40a7baa 100644
--- a/src/uml/qremovevariablevalueaction.cpp
+++ b/src/uml/qremovevariablevalueaction.cpp
@@ -148,18 +148,6 @@ void QRemoveVariableValueAction::setRemoveAt(QInputPin *removeAt)
     }
 }
 
-void QRemoveVariableValueAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QWriteVariableAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QRemoveVariableValueAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QRemoveVariableValueAction")][QString::fromLatin1("isRemoveDuplicates")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qremovevariablevalueaction.h b/src/uml/qremovevariablevalueaction.h
index a5b41c95..8edb4b24 100644
--- a/src/uml/qremovevariablevalueaction.h
+++ b/src/uml/qremovevariablevalueaction.h
@@ -79,7 +79,7 @@ public:
     // Association ends from QRemoveVariableValueAction
     Q_INVOKABLE QInputPin *removeAt() const;
     Q_INVOKABLE void setRemoveAt(QInputPin *removeAt);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qreplyaction.cpp b/src/uml/qreplyaction.cpp
index 139a90e4..92c8a4e6 100644
--- a/src/uml/qreplyaction.cpp
+++ b/src/uml/qreplyaction.cpp
@@ -174,22 +174,6 @@ void QReplyAction::removeReplyValue(QInputPin *replyValue)
     }
 }
 
-void QReplyAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QTrigger *>("QTrigger *");
-    qRegisterMetaType<QSet<QTrigger *>>("QSet<QTrigger *>");
-    qRegisterMetaType<QList<QTrigger *>>("QList<QTrigger *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QReplyAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QReplyAction")][QString::fromLatin1("replyToCall")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qreplyaction.h b/src/uml/qreplyaction.h
index 6eaf32e4..448f7e3d 100644
--- a/src/uml/qreplyaction.h
+++ b/src/uml/qreplyaction.h
@@ -84,7 +84,7 @@ public:
     Q_INVOKABLE QSet<QInputPin *> replyValues() const;
     Q_INVOKABLE void addReplyValue(QInputPin *replyValue);
     Q_INVOKABLE void removeReplyValue(QInputPin *replyValue);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qsendobjectaction.cpp b/src/uml/qsendobjectaction.cpp
index 683df247..32a77279 100644
--- a/src/uml/qsendobjectaction.cpp
+++ b/src/uml/qsendobjectaction.cpp
@@ -139,18 +139,6 @@ void QSendObjectAction::setTarget(QInputPin *target)
     }
 }
 
-void QSendObjectAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QInvocationAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QSendObjectAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QSendObjectAction")][QString::fromLatin1("request")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qsendobjectaction.h b/src/uml/qsendobjectaction.h
index 976d7b15..aca90a29 100644
--- a/src/uml/qsendobjectaction.h
+++ b/src/uml/qsendobjectaction.h
@@ -76,7 +76,7 @@ public:
     Q_INVOKABLE void setRequest(QInputPin *request);
     Q_INVOKABLE QInputPin *target() const;
     Q_INVOKABLE void setTarget(QInputPin *target);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qsendsignalaction.cpp b/src/uml/qsendsignalaction.cpp
index 746f3701..412b98c2 100644
--- a/src/uml/qsendsignalaction.cpp
+++ b/src/uml/qsendsignalaction.cpp
@@ -137,22 +137,6 @@ void QSendSignalAction::setSignal(QSignal *signal)
     }
 }
 
-void QSendSignalAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QSignal *>("QSignal *");
-    qRegisterMetaType<QSet<QSignal *>>("QSet<QSignal *>");
-    qRegisterMetaType<QList<QSignal *>>("QList<QSignal *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QInvocationAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QSendSignalAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QSendSignalAction")][QString::fromLatin1("target")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qsendsignalaction.h b/src/uml/qsendsignalaction.h
index dc555f3a..24793fa4 100644
--- a/src/uml/qsendsignalaction.h
+++ b/src/uml/qsendsignalaction.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setTarget(QInputPin *target);
     Q_INVOKABLE QSignal *signal() const;
     Q_INVOKABLE void setSignal(QSignal *signal);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qsequencenode.cpp b/src/uml/qsequencenode.cpp
index 8e1c466b..3420d120 100644
--- a/src/uml/qsequencenode.cpp
+++ b/src/uml/qsequencenode.cpp
@@ -117,18 +117,6 @@ void QSequenceNode::removeExecutableNode(QExecutableNode *executableNode)
     }
 }
 
-void QSequenceNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QExecutableNode *>("QExecutableNode *");
-    qRegisterMetaType<QSet<QExecutableNode *>>("QSet<QExecutableNode *>");
-    qRegisterMetaType<QList<QExecutableNode *>>("QList<QExecutableNode *>");
-
-    QStructuredActivityNode::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QSequenceNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QSequenceNode")][QString::fromLatin1("executableNodes")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qsequencenode.h b/src/uml/qsequencenode.h
index 3c861998..35eba6e4 100644
--- a/src/uml/qsequencenode.h
+++ b/src/uml/qsequencenode.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE QList<QExecutableNode *> executableNodes() const;
     Q_INVOKABLE void addExecutableNode(QExecutableNode *executableNode);
     Q_INVOKABLE void removeExecutableNode(QExecutableNode *executableNode);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qsignal.cpp b/src/uml/qsignal.cpp
index ff42a11e..da1abace 100644
--- a/src/uml/qsignal.cpp
+++ b/src/uml/qsignal.cpp
@@ -123,18 +123,6 @@ void QSignal::removeOwnedAttribute(QProperty *ownedAttribute)
     }
 }
 
-void QSignal::registerMetaTypes() const
-{
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    QClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QSignal::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QSignal")][QString::fromLatin1("ownedAttributes")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qsignal.h b/src/uml/qsignal.h
index 4276334f..afe68c27 100644
--- a/src/uml/qsignal.h
+++ b/src/uml/qsignal.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE QList<QProperty *> ownedAttributes() const;
     Q_INVOKABLE void addOwnedAttribute(QProperty *ownedAttribute);
     Q_INVOKABLE void removeOwnedAttribute(QProperty *ownedAttribute);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qsignalevent.cpp b/src/uml/qsignalevent.cpp
index e94bdf29..ff6e38d1 100644
--- a/src/uml/qsignalevent.cpp
+++ b/src/uml/qsignalevent.cpp
@@ -106,18 +106,6 @@ void QSignalEvent::setSignal(QSignal *signal)
     }
 }
 
-void QSignalEvent::registerMetaTypes() const
-{
-    qRegisterMetaType<QSignal *>("QSignal *");
-    qRegisterMetaType<QSet<QSignal *>>("QSet<QSignal *>");
-    qRegisterMetaType<QList<QSignal *>>("QList<QSignal *>");
-
-    QMessageEvent::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QSignalEvent::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QSignalEvent")][QString::fromLatin1("signal")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qsignalevent.h b/src/uml/qsignalevent.h
index f185843b..aa657cbf 100644
--- a/src/uml/qsignalevent.h
+++ b/src/uml/qsignalevent.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QSignalEvent
     Q_INVOKABLE QSignal *signal() const;
     Q_INVOKABLE void setSignal(QSignal *signal);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qslot.cpp b/src/uml/qslot.cpp
index b59fb999..43f28075 100644
--- a/src/uml/qslot.cpp
+++ b/src/uml/qslot.cpp
@@ -178,26 +178,6 @@ void QSlot::setOwningInstance(QInstanceSpecification *owningInstance)
     }
 }
 
-void QSlot::registerMetaTypes() const
-{
-    qRegisterMetaType<QStructuralFeature *>("QStructuralFeature *");
-    qRegisterMetaType<QSet<QStructuralFeature *>>("QSet<QStructuralFeature *>");
-    qRegisterMetaType<QList<QStructuralFeature *>>("QList<QStructuralFeature *>");
-
-    qRegisterMetaType<QInstanceSpecification *>("QInstanceSpecification *");
-    qRegisterMetaType<QSet<QInstanceSpecification *>>("QSet<QInstanceSpecification *>");
-    qRegisterMetaType<QList<QInstanceSpecification *>>("QList<QInstanceSpecification *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QSlot::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QSlot")][QString::fromLatin1("values")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qslot.h b/src/uml/qslot.h
index 1317d1dd..4bd0c39c 100644
--- a/src/uml/qslot.h
+++ b/src/uml/qslot.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE void setDefiningFeature(QStructuralFeature *definingFeature);
     Q_INVOKABLE QInstanceSpecification *owningInstance() const;
     Q_INVOKABLE void setOwningInstance(QInstanceSpecification *owningInstance);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstartclassifierbehavioraction.cpp b/src/uml/qstartclassifierbehavioraction.cpp
index f5ff3b96..d6b5239e 100644
--- a/src/uml/qstartclassifierbehavioraction.cpp
+++ b/src/uml/qstartclassifierbehavioraction.cpp
@@ -114,18 +114,6 @@ void QStartClassifierBehaviorAction::setObject(QInputPin *object)
     }
 }
 
-void QStartClassifierBehaviorAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStartClassifierBehaviorAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStartClassifierBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qstartclassifierbehavioraction.h b/src/uml/qstartclassifierbehavioraction.h
index 4c9ee2e8..d6f69d7f 100644
--- a/src/uml/qstartclassifierbehavioraction.h
+++ b/src/uml/qstartclassifierbehavioraction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QStartClassifierBehaviorAction
     Q_INVOKABLE QInputPin *object() const;
     Q_INVOKABLE void setObject(QInputPin *object);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstartobjectbehavioraction.cpp b/src/uml/qstartobjectbehavioraction.cpp
index edfec56d..37ed7258 100644
--- a/src/uml/qstartobjectbehavioraction.cpp
+++ b/src/uml/qstartobjectbehavioraction.cpp
@@ -114,18 +114,6 @@ void QStartObjectBehaviorAction::setObject(QInputPin *object)
     }
 }
 
-void QStartObjectBehaviorAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QCallAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStartObjectBehaviorAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStartObjectBehaviorAction")][QString::fromLatin1("object")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qstartobjectbehavioraction.h b/src/uml/qstartobjectbehavioraction.h
index 3cfe3ce3..c24109b5 100644
--- a/src/uml/qstartobjectbehavioraction.h
+++ b/src/uml/qstartobjectbehavioraction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QStartObjectBehaviorAction
     Q_INVOKABLE QInputPin *object() const;
     Q_INVOKABLE void setObject(QInputPin *object);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstate.cpp b/src/uml/qstate.cpp
index 9920193c..ac25bb33 100644
--- a/src/uml/qstate.cpp
+++ b/src/uml/qstate.cpp
@@ -809,46 +809,6 @@ bool QState::isRedefinitionContextValid(const QState *redefined) const
     return bool(); // change here to your derived return
 }
 
-void QState::registerMetaTypes() const
-{
-    qRegisterMetaType<QStateMachine *>("QStateMachine *");
-    qRegisterMetaType<QSet<QStateMachine *>>("QSet<QStateMachine *>");
-    qRegisterMetaType<QList<QStateMachine *>>("QList<QStateMachine *>");
-
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QRegion *>("QRegion *");
-    qRegisterMetaType<QSet<QRegion *>>("QSet<QRegion *>");
-    qRegisterMetaType<QList<QRegion *>>("QList<QRegion *>");
-
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    qRegisterMetaType<QConnectionPointReference *>("QConnectionPointReference *");
-    qRegisterMetaType<QSet<QConnectionPointReference *>>("QSet<QConnectionPointReference *>");
-    qRegisterMetaType<QList<QConnectionPointReference *>>("QList<QConnectionPointReference *>");
-
-    qRegisterMetaType<QTrigger *>("QTrigger *");
-    qRegisterMetaType<QSet<QTrigger *>>("QSet<QTrigger *>");
-    qRegisterMetaType<QList<QTrigger *>>("QList<QTrigger *>");
-
-    qRegisterMetaType<QPseudostate *>("QPseudostate *");
-    qRegisterMetaType<QSet<QPseudostate *>>("QSet<QPseudostate *>");
-    qRegisterMetaType<QList<QPseudostate *>>("QList<QPseudostate *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QState::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QState")][QString::fromLatin1("isSimple")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qstate.h b/src/uml/qstate.h
index 0ecd847c..6bd0e69e 100644
--- a/src/uml/qstate.h
+++ b/src/uml/qstate.h
@@ -185,7 +185,7 @@ public:
     Q_INVOKABLE QStateMachine *containingStateMachine() const;
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
     Q_INVOKABLE bool isRedefinitionContextValid(const QState *redefined) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstateinvariant.cpp b/src/uml/qstateinvariant.cpp
index 8bff3c74..d3db1912 100644
--- a/src/uml/qstateinvariant.cpp
+++ b/src/uml/qstateinvariant.cpp
@@ -137,22 +137,6 @@ void QStateInvariant::setCovered(QLifeline *covered)
     }
 }
 
-void QStateInvariant::registerMetaTypes() const
-{
-    qRegisterMetaType<QLifeline *>("QLifeline *");
-    qRegisterMetaType<QSet<QLifeline *>>("QSet<QLifeline *>");
-    qRegisterMetaType<QList<QLifeline *>>("QList<QLifeline *>");
-
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    QInteractionFragment::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStateInvariant::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStateInvariant")][QString::fromLatin1("invariant")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qstateinvariant.h b/src/uml/qstateinvariant.h
index 5be17ca7..430b2b11 100644
--- a/src/uml/qstateinvariant.h
+++ b/src/uml/qstateinvariant.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setInvariant(QConstraint *invariant);
     Q_INVOKABLE QLifeline *covered() const;
     Q_INVOKABLE void setCovered(QLifeline *covered);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstatemachine.cpp b/src/uml/qstatemachine.cpp
index 47b08fda..7af678de 100644
--- a/src/uml/qstatemachine.cpp
+++ b/src/uml/qstatemachine.cpp
@@ -288,34 +288,6 @@ bool QStateMachine::isRedefinitionContextValid(const QStateMachine *redefined) c
     return bool(); // change here to your derived return
 }
 
-void QStateMachine::registerMetaTypes() const
-{
-    qRegisterMetaType<QNamespace *>("QNamespace *");
-    qRegisterMetaType<QSet<QNamespace *>>("QSet<QNamespace *>");
-    qRegisterMetaType<QList<QNamespace *>>("QList<QNamespace *>");
-
-    qRegisterMetaType<QRedefinableElement *>("QRedefinableElement *");
-    qRegisterMetaType<QSet<QRedefinableElement *>>("QSet<QRedefinableElement *>");
-    qRegisterMetaType<QList<QRedefinableElement *>>("QList<QRedefinableElement *>");
-
-    qRegisterMetaType<QState *>("QState *");
-    qRegisterMetaType<QSet<QState *>>("QSet<QState *>");
-    qRegisterMetaType<QList<QState *>>("QList<QState *>");
-
-    qRegisterMetaType<QPseudostate *>("QPseudostate *");
-    qRegisterMetaType<QSet<QPseudostate *>>("QSet<QPseudostate *>");
-    qRegisterMetaType<QList<QPseudostate *>>("QList<QPseudostate *>");
-
-    qRegisterMetaType<QRegion *>("QRegion *");
-    qRegisterMetaType<QSet<QRegion *>>("QSet<QRegion *>");
-    qRegisterMetaType<QList<QRegion *>>("QList<QRegion *>");
-
-    QBehavior::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStateMachine::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStateMachine")][QString::fromLatin1("extendedStateMachines")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qstatemachine.h b/src/uml/qstatemachine.h
index 845e8c88..875f7a99 100644
--- a/src/uml/qstatemachine.h
+++ b/src/uml/qstatemachine.h
@@ -99,7 +99,7 @@ public:
     Q_INVOKABLE bool ancestor(const QState *s1, const QState *s2) const;
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
     Q_INVOKABLE bool isRedefinitionContextValid(const QStateMachine *redefined) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstereotype.cpp b/src/uml/qstereotype.cpp
index 93cda55c..2a1d93c4 100644
--- a/src/uml/qstereotype.cpp
+++ b/src/uml/qstereotype.cpp
@@ -144,22 +144,6 @@ QProfile *QStereotype::containingProfile() const
     return 0; // change here to your derived return
 }
 
-void QStereotype::registerMetaTypes() const
-{
-    qRegisterMetaType<QImage *>("QImage *");
-    qRegisterMetaType<QSet<QImage *>>("QSet<QImage *>");
-    qRegisterMetaType<QList<QImage *>>("QList<QImage *>");
-
-    qRegisterMetaType<QProfile *>("QProfile *");
-    qRegisterMetaType<QSet<QProfile *>>("QSet<QProfile *>");
-    qRegisterMetaType<QList<QProfile *>>("QList<QProfile *>");
-
-    QClass::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStereotype::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStereotype")][QString::fromLatin1("icons")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qstereotype.h b/src/uml/qstereotype.h
index 26e9acc5..4eaa3abf 100644
--- a/src/uml/qstereotype.h
+++ b/src/uml/qstereotype.h
@@ -83,7 +83,7 @@ public:
 
     // Operations
     Q_INVOKABLE QProfile *containingProfile() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstringexpression.cpp b/src/uml/qstringexpression.cpp
index 289a741b..9e396a9f 100644
--- a/src/uml/qstringexpression.cpp
+++ b/src/uml/qstringexpression.cpp
@@ -245,14 +245,6 @@ QString QStringExpression::stringValue() const
     return QString(); // change here to your derived return
 }
 
-void QStringExpression::registerMetaTypes() const
-{
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStringExpression::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStringExpression")][QString::fromLatin1("owningExpression")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qstringexpression.h b/src/uml/qstringexpression.h
index 120da9b8..7247f017 100644
--- a/src/uml/qstringexpression.h
+++ b/src/uml/qstringexpression.h
@@ -98,7 +98,7 @@ public:
 
     // Operations
     Q_INVOKABLE QString stringValue() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstructuralfeature.cpp b/src/uml/qstructuralfeature.cpp
index 3f919e89..295ba912 100644
--- a/src/uml/qstructuralfeature.cpp
+++ b/src/uml/qstructuralfeature.cpp
@@ -441,14 +441,6 @@ void QStructuralFeature::unsetReadOnly()
     d->modifiedResettableProperties.removeAll(QString::fromLatin1("isReadOnly"));
 }
 
-void QStructuralFeature::registerMetaTypes() const
-{
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStructuralFeature::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeature")][QString::fromLatin1("isReadOnly")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qstructuralfeature.h b/src/uml/qstructuralfeature.h
index cf1a2734..fe1d520d 100644
--- a/src/uml/qstructuralfeature.h
+++ b/src/uml/qstructuralfeature.h
@@ -137,7 +137,7 @@ public:
     Q_INVOKABLE bool isReadOnly() const;
     Q_INVOKABLE void setReadOnly(bool isReadOnly);
     Q_INVOKABLE void unsetReadOnly();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstructuralfeatureaction.cpp b/src/uml/qstructuralfeatureaction.cpp
index 550640f5..82338c66 100644
--- a/src/uml/qstructuralfeatureaction.cpp
+++ b/src/uml/qstructuralfeatureaction.cpp
@@ -137,22 +137,6 @@ void QStructuralFeatureAction::setStructuralFeature(QStructuralFeature *structur
     }
 }
 
-void QStructuralFeatureAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QStructuralFeature *>("QStructuralFeature *");
-    qRegisterMetaType<QSet<QStructuralFeature *>>("QSet<QStructuralFeature *>");
-    qRegisterMetaType<QList<QStructuralFeature *>>("QList<QStructuralFeature *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStructuralFeatureAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuralFeatureAction")][QString::fromLatin1("object")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qstructuralfeatureaction.h b/src/uml/qstructuralfeatureaction.h
index 8f4a569f..ff38c18b 100644
--- a/src/uml/qstructuralfeatureaction.h
+++ b/src/uml/qstructuralfeatureaction.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setObject(QInputPin *object);
     Q_INVOKABLE QStructuralFeature *structuralFeature() const;
     Q_INVOKABLE void setStructuralFeature(QStructuralFeature *structuralFeature);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstructuredactivitynode.cpp b/src/uml/qstructuredactivitynode.cpp
index e92cccd9..3b1e2903 100644
--- a/src/uml/qstructuredactivitynode.cpp
+++ b/src/uml/qstructuredactivitynode.cpp
@@ -866,38 +866,6 @@ void QStructuredActivityNode::setActivity(QActivity *activity)
     }
 }
 
-void QStructuredActivityNode::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    qRegisterMetaType<QVariable *>("QVariable *");
-    qRegisterMetaType<QSet<QVariable *>>("QSet<QVariable *>");
-    qRegisterMetaType<QList<QVariable *>>("QList<QVariable *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QActivityEdge *>("QActivityEdge *");
-    qRegisterMetaType<QSet<QActivityEdge *>>("QSet<QActivityEdge *>");
-    qRegisterMetaType<QList<QActivityEdge *>>("QList<QActivityEdge *>");
-
-    qRegisterMetaType<QActivity *>("QActivity *");
-    qRegisterMetaType<QSet<QActivity *>>("QSet<QActivity *>");
-    qRegisterMetaType<QList<QActivity *>>("QList<QActivity *>");
-
-    qRegisterMetaType<QActivityNode *>("QActivityNode *");
-    qRegisterMetaType<QSet<QActivityNode *>>("QSet<QActivityNode *>");
-    qRegisterMetaType<QList<QActivityNode *>>("QList<QActivityNode *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStructuredActivityNode::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredActivityNode")][QString::fromLatin1("mustIsolate")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qstructuredactivitynode.h b/src/uml/qstructuredactivitynode.h
index 0e7c87a9..291dc378 100644
--- a/src/uml/qstructuredactivitynode.h
+++ b/src/uml/qstructuredactivitynode.h
@@ -203,7 +203,7 @@ public:
     Q_INVOKABLE void removeVariable(QVariable *variable);
     Q_INVOKABLE QActivity *activity() const;
     Q_INVOKABLE void setActivity(QActivity *activity);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qstructuredclassifier.cpp b/src/uml/qstructuredclassifier.cpp
index 1165259d..1d272778 100644
--- a/src/uml/qstructuredclassifier.cpp
+++ b/src/uml/qstructuredclassifier.cpp
@@ -213,26 +213,6 @@ void QStructuredClassifier::removeOwnedConnector(QConnector *ownedConnector)
     }
 }
 
-void QStructuredClassifier::registerMetaTypes() const
-{
-    qRegisterMetaType<QProperty *>("QProperty *");
-    qRegisterMetaType<QSet<QProperty *>>("QSet<QProperty *>");
-    qRegisterMetaType<QList<QProperty *>>("QList<QProperty *>");
-
-    qRegisterMetaType<QConnector *>("QConnector *");
-    qRegisterMetaType<QSet<QConnector *>>("QSet<QConnector *>");
-    qRegisterMetaType<QList<QConnector *>>("QList<QConnector *>");
-
-    qRegisterMetaType<QConnectableElement *>("QConnectableElement *");
-    qRegisterMetaType<QSet<QConnectableElement *>>("QSet<QConnectableElement *>");
-    qRegisterMetaType<QList<QConnectableElement *>>("QList<QConnectableElement *>");
-
-    QClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QStructuredClassifier::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QStructuredClassifier")][QString::fromLatin1("roles")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qstructuredclassifier.h b/src/uml/qstructuredclassifier.h
index fb113a84..a9881ce1 100644
--- a/src/uml/qstructuredclassifier.h
+++ b/src/uml/qstructuredclassifier.h
@@ -88,7 +88,7 @@ public:
     Q_INVOKABLE QSet<QConnector *> ownedConnectors() const;
     Q_INVOKABLE void addOwnedConnector(QConnector *ownedConnector);
     Q_INVOKABLE void removeOwnedConnector(QConnector *ownedConnector);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qsubstitution.cpp b/src/uml/qsubstitution.cpp
index 3f74f364..b01923fe 100644
--- a/src/uml/qsubstitution.cpp
+++ b/src/uml/qsubstitution.cpp
@@ -153,18 +153,6 @@ void QSubstitution::setSubstitutingClassifier(QClassifier *substitutingClassifie
     }
 }
 
-void QSubstitution::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    QRealization::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QSubstitution::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QSubstitution")][QString::fromLatin1("contract")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qsubstitution.h b/src/uml/qsubstitution.h
index d96b0673..0d08a6f1 100644
--- a/src/uml/qsubstitution.h
+++ b/src/uml/qsubstitution.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE void removeSupplier(QWrappedObjectPointer<QClassifier> contract);
     Q_INVOKABLE void addClient(QWrappedObjectPointer<QClassifier> substitutingClassifier);
     Q_INVOKABLE void removeClient(QWrappedObjectPointer<QClassifier> substitutingClassifier);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtemplateableelement.cpp b/src/uml/qtemplateableelement.cpp
index 27c3a643..5bd7f995 100644
--- a/src/uml/qtemplateableelement.cpp
+++ b/src/uml/qtemplateableelement.cpp
@@ -184,26 +184,6 @@ QSet<QParameterableElement *> QTemplateableElement::parameterableElements() cons
     return QSet<QParameterableElement *>(); // change here to your derived return
 }
 
-void QTemplateableElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QTemplateSignature *>("QTemplateSignature *");
-    qRegisterMetaType<QSet<QTemplateSignature *>>("QSet<QTemplateSignature *>");
-    qRegisterMetaType<QList<QTemplateSignature *>>("QList<QTemplateSignature *>");
-
-    qRegisterMetaType<QTemplateBinding *>("QTemplateBinding *");
-    qRegisterMetaType<QSet<QTemplateBinding *>>("QSet<QTemplateBinding *>");
-    qRegisterMetaType<QList<QTemplateBinding *>>("QList<QTemplateBinding *>");
-
-    qRegisterMetaType<QParameterableElement *>("QParameterableElement *");
-    qRegisterMetaType<QSet<QParameterableElement *>>("QSet<QParameterableElement *>");
-    qRegisterMetaType<QList<QParameterableElement *>>("QList<QParameterableElement *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTemplateableElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateableElement")][QString::fromLatin1("ownedTemplateSignature")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qtemplateableelement.h b/src/uml/qtemplateableelement.h
index 0aec3636..63c67692 100644
--- a/src/uml/qtemplateableelement.h
+++ b/src/uml/qtemplateableelement.h
@@ -86,7 +86,7 @@ public:
     // Operations
     Q_INVOKABLE bool isTemplate() const;
     Q_INVOKABLE QSet<QParameterableElement *> parameterableElements() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtemplatebinding.cpp b/src/uml/qtemplatebinding.cpp
index 2efc2cf1..a9944b21 100644
--- a/src/uml/qtemplatebinding.cpp
+++ b/src/uml/qtemplatebinding.cpp
@@ -198,26 +198,6 @@ void QTemplateBinding::removeParameterSubstitution(QTemplateParameterSubstitutio
     }
 }
 
-void QTemplateBinding::registerMetaTypes() const
-{
-    qRegisterMetaType<QTemplateableElement *>("QTemplateableElement *");
-    qRegisterMetaType<QSet<QTemplateableElement *>>("QSet<QTemplateableElement *>");
-    qRegisterMetaType<QList<QTemplateableElement *>>("QList<QTemplateableElement *>");
-
-    qRegisterMetaType<QTemplateParameterSubstitution *>("QTemplateParameterSubstitution *");
-    qRegisterMetaType<QSet<QTemplateParameterSubstitution *>>("QSet<QTemplateParameterSubstitution *>");
-    qRegisterMetaType<QList<QTemplateParameterSubstitution *>>("QList<QTemplateParameterSubstitution *>");
-
-    qRegisterMetaType<QTemplateSignature *>("QTemplateSignature *");
-    qRegisterMetaType<QSet<QTemplateSignature *>>("QSet<QTemplateSignature *>");
-    qRegisterMetaType<QList<QTemplateSignature *>>("QList<QTemplateSignature *>");
-
-    QDirectedRelationship::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTemplateBinding::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateBinding")][QString::fromLatin1("signature")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtemplatebinding.h b/src/uml/qtemplatebinding.h
index 6485d505..c2c17212 100644
--- a/src/uml/qtemplatebinding.h
+++ b/src/uml/qtemplatebinding.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE QSet<QTemplateParameterSubstitution *> parameterSubstitutions() const;
     Q_INVOKABLE void addParameterSubstitution(QTemplateParameterSubstitution *parameterSubstitution);
     Q_INVOKABLE void removeParameterSubstitution(QTemplateParameterSubstitution *parameterSubstitution);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtemplateparameter.cpp b/src/uml/qtemplateparameter.cpp
index f7804577..4b6b8f19 100644
--- a/src/uml/qtemplateparameter.cpp
+++ b/src/uml/qtemplateparameter.cpp
@@ -234,22 +234,6 @@ void QTemplateParameter::setSignature(QTemplateSignature *signature)
     }
 }
 
-void QTemplateParameter::registerMetaTypes() const
-{
-    qRegisterMetaType<QParameterableElement *>("QParameterableElement *");
-    qRegisterMetaType<QSet<QParameterableElement *>>("QSet<QParameterableElement *>");
-    qRegisterMetaType<QList<QParameterableElement *>>("QList<QParameterableElement *>");
-
-    qRegisterMetaType<QTemplateSignature *>("QTemplateSignature *");
-    qRegisterMetaType<QSet<QTemplateSignature *>>("QSet<QTemplateSignature *>");
-    qRegisterMetaType<QList<QTemplateSignature *>>("QList<QTemplateSignature *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTemplateParameter::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameter")][QString::fromLatin1("default_")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtemplateparameter.h b/src/uml/qtemplateparameter.h
index 94fe7636..c7eb1859 100644
--- a/src/uml/qtemplateparameter.h
+++ b/src/uml/qtemplateparameter.h
@@ -86,7 +86,7 @@ public:
     Q_INVOKABLE void setOwnedDefault(QParameterableElement *ownedDefault);
     Q_INVOKABLE QTemplateSignature *signature() const;
     Q_INVOKABLE void setSignature(QTemplateSignature *signature);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtemplateparametersubstitution.cpp b/src/uml/qtemplateparametersubstitution.cpp
index ee9ab6b9..1e4b8e49 100644
--- a/src/uml/qtemplateparametersubstitution.cpp
+++ b/src/uml/qtemplateparametersubstitution.cpp
@@ -194,26 +194,6 @@ void QTemplateParameterSubstitution::setTemplateBinding(QTemplateBinding *templa
     }
 }
 
-void QTemplateParameterSubstitution::registerMetaTypes() const
-{
-    qRegisterMetaType<QParameterableElement *>("QParameterableElement *");
-    qRegisterMetaType<QSet<QParameterableElement *>>("QSet<QParameterableElement *>");
-    qRegisterMetaType<QList<QParameterableElement *>>("QList<QParameterableElement *>");
-
-    qRegisterMetaType<QTemplateParameter *>("QTemplateParameter *");
-    qRegisterMetaType<QSet<QTemplateParameter *>>("QSet<QTemplateParameter *>");
-    qRegisterMetaType<QList<QTemplateParameter *>>("QList<QTemplateParameter *>");
-
-    qRegisterMetaType<QTemplateBinding *>("QTemplateBinding *");
-    qRegisterMetaType<QSet<QTemplateBinding *>>("QSet<QTemplateBinding *>");
-    qRegisterMetaType<QList<QTemplateBinding *>>("QList<QTemplateBinding *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTemplateParameterSubstitution::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateParameterSubstitution")][QString::fromLatin1("ownedActual")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qtemplateparametersubstitution.h b/src/uml/qtemplateparametersubstitution.h
index b92419de..279dfa25 100644
--- a/src/uml/qtemplateparametersubstitution.h
+++ b/src/uml/qtemplateparametersubstitution.h
@@ -84,7 +84,7 @@ public:
     Q_INVOKABLE void setActual(QParameterableElement *actual);
     Q_INVOKABLE QTemplateBinding *templateBinding() const;
     Q_INVOKABLE void setTemplateBinding(QTemplateBinding *templateBinding);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtemplatesignature.cpp b/src/uml/qtemplatesignature.cpp
index c5b7751f..5968bf62 100644
--- a/src/uml/qtemplatesignature.cpp
+++ b/src/uml/qtemplatesignature.cpp
@@ -191,22 +191,6 @@ void QTemplateSignature::removeOwnedParameter(QTemplateParameter *ownedParameter
     }
 }
 
-void QTemplateSignature::registerMetaTypes() const
-{
-    qRegisterMetaType<QTemplateParameter *>("QTemplateParameter *");
-    qRegisterMetaType<QSet<QTemplateParameter *>>("QSet<QTemplateParameter *>");
-    qRegisterMetaType<QList<QTemplateParameter *>>("QList<QTemplateParameter *>");
-
-    qRegisterMetaType<QTemplateableElement *>("QTemplateableElement *");
-    qRegisterMetaType<QSet<QTemplateableElement *>>("QSet<QTemplateableElement *>");
-    qRegisterMetaType<QList<QTemplateableElement *>>("QList<QTemplateableElement *>");
-
-    QElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTemplateSignature::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTemplateSignature")][QString::fromLatin1("parameters")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtemplatesignature.h b/src/uml/qtemplatesignature.h
index 66418bba..3dd76bfb 100644
--- a/src/uml/qtemplatesignature.h
+++ b/src/uml/qtemplatesignature.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE QList<QTemplateParameter *> ownedParameters() const;
     Q_INVOKABLE void addOwnedParameter(QTemplateParameter *ownedParameter);
     Q_INVOKABLE void removeOwnedParameter(QTemplateParameter *ownedParameter);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtestidentityaction.cpp b/src/uml/qtestidentityaction.cpp
index 9b1fa03f..de576dff 100644
--- a/src/uml/qtestidentityaction.cpp
+++ b/src/uml/qtestidentityaction.cpp
@@ -175,22 +175,6 @@ void QTestIdentityAction::setFirst(QInputPin *first)
     }
 }
 
-void QTestIdentityAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTestIdentityAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTestIdentityAction")][QString::fromLatin1("second")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qtestidentityaction.h b/src/uml/qtestidentityaction.h
index 4b2b9d04..49013fe0 100644
--- a/src/uml/qtestidentityaction.h
+++ b/src/uml/qtestidentityaction.h
@@ -80,7 +80,7 @@ public:
     Q_INVOKABLE void setResult(QOutputPin *result);
     Q_INVOKABLE QInputPin *first() const;
     Q_INVOKABLE void setFirst(QInputPin *first);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtimeconstraint.cpp b/src/uml/qtimeconstraint.cpp
index c9694c41..443f4b26 100644
--- a/src/uml/qtimeconstraint.cpp
+++ b/src/uml/qtimeconstraint.cpp
@@ -143,18 +143,6 @@ void QTimeConstraint::setSpecification(QTimeInterval *specification)
     }
 }
 
-void QTimeConstraint::registerMetaTypes() const
-{
-    qRegisterMetaType<QTimeInterval *>("QTimeInterval *");
-    qRegisterMetaType<QSet<QTimeInterval *>>("QSet<QTimeInterval *>");
-    qRegisterMetaType<QList<QTimeInterval *>>("QList<QTimeInterval *>");
-
-    QIntervalConstraint::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTimeConstraint::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeConstraint")][QString::fromLatin1("firstEvent")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtimeconstraint.h b/src/uml/qtimeconstraint.h
index 403de170..d434cf42 100644
--- a/src/uml/qtimeconstraint.h
+++ b/src/uml/qtimeconstraint.h
@@ -79,7 +79,7 @@ public:
     // Association ends from QTimeConstraint
     Q_INVOKABLE QTimeInterval *specification() const;
     Q_INVOKABLE void setSpecification(QTimeInterval *specification);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtimeevent.cpp b/src/uml/qtimeevent.cpp
index 9774c53a..45d24519 100644
--- a/src/uml/qtimeevent.cpp
+++ b/src/uml/qtimeevent.cpp
@@ -148,18 +148,6 @@ void QTimeEvent::setWhen(QTimeExpression *when)
     }
 }
 
-void QTimeEvent::registerMetaTypes() const
-{
-    qRegisterMetaType<QTimeExpression *>("QTimeExpression *");
-    qRegisterMetaType<QSet<QTimeExpression *>>("QSet<QTimeExpression *>");
-    qRegisterMetaType<QList<QTimeExpression *>>("QList<QTimeExpression *>");
-
-    QEvent::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTimeEvent::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeEvent")][QString::fromLatin1("isRelative")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtimeevent.h b/src/uml/qtimeevent.h
index dc384cae..3a14f4c9 100644
--- a/src/uml/qtimeevent.h
+++ b/src/uml/qtimeevent.h
@@ -79,7 +79,7 @@ public:
     // Association ends from QTimeEvent
     Q_INVOKABLE QTimeExpression *when() const;
     Q_INVOKABLE void setWhen(QTimeExpression *when);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtimeexpression.cpp b/src/uml/qtimeexpression.cpp
index e8f68724..5e76059f 100644
--- a/src/uml/qtimeexpression.cpp
+++ b/src/uml/qtimeexpression.cpp
@@ -145,18 +145,6 @@ void QTimeExpression::setExpr(QValueSpecification *expr)
     }
 }
 
-void QTimeExpression::registerMetaTypes() const
-{
-    qRegisterMetaType<QObservation *>("QObservation *");
-    qRegisterMetaType<QSet<QObservation *>>("QSet<QObservation *>");
-    qRegisterMetaType<QList<QObservation *>>("QList<QObservation *>");
-
-    QValueSpecification::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTimeExpression::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeExpression")][QString::fromLatin1("observations")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtimeexpression.h b/src/uml/qtimeexpression.h
index 2559e54b..ad5ae190 100644
--- a/src/uml/qtimeexpression.h
+++ b/src/uml/qtimeexpression.h
@@ -80,7 +80,7 @@ public:
     Q_INVOKABLE void removeObservation(QObservation *observation);
     Q_INVOKABLE QValueSpecification *expr() const;
     Q_INVOKABLE void setExpr(QValueSpecification *expr);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtimeinterval.cpp b/src/uml/qtimeinterval.cpp
index 48b77d43..a6f230f6 100644
--- a/src/uml/qtimeinterval.cpp
+++ b/src/uml/qtimeinterval.cpp
@@ -128,18 +128,6 @@ void QTimeInterval::setMin(QTimeExpression *min)
     }
 }
 
-void QTimeInterval::registerMetaTypes() const
-{
-    qRegisterMetaType<QTimeExpression *>("QTimeExpression *");
-    qRegisterMetaType<QSet<QTimeExpression *>>("QSet<QTimeExpression *>");
-    qRegisterMetaType<QList<QTimeExpression *>>("QList<QTimeExpression *>");
-
-    QInterval::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTimeInterval::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeInterval")][QString::fromLatin1("max")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtimeinterval.h b/src/uml/qtimeinterval.h
index 9d8a8816..be055847 100644
--- a/src/uml/qtimeinterval.h
+++ b/src/uml/qtimeinterval.h
@@ -76,7 +76,7 @@ public:
     Q_INVOKABLE void setMax(QTimeExpression *max);
     Q_INVOKABLE QTimeExpression *min() const;
     Q_INVOKABLE void setMin(QTimeExpression *min);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtimeobservation.cpp b/src/uml/qtimeobservation.cpp
index 9be54126..892bc7d7 100644
--- a/src/uml/qtimeobservation.cpp
+++ b/src/uml/qtimeobservation.cpp
@@ -140,18 +140,6 @@ void QTimeObservation::setEvent(QNamedElement *event)
     }
 }
 
-void QTimeObservation::registerMetaTypes() const
-{
-    qRegisterMetaType<QNamedElement *>("QNamedElement *");
-    qRegisterMetaType<QSet<QNamedElement *>>("QSet<QNamedElement *>");
-    qRegisterMetaType<QList<QNamedElement *>>("QList<QNamedElement *>");
-
-    QObservation::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTimeObservation::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTimeObservation")][QString::fromLatin1("firstEvent")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtimeobservation.h b/src/uml/qtimeobservation.h
index 933ac209..219d694f 100644
--- a/src/uml/qtimeobservation.h
+++ b/src/uml/qtimeobservation.h
@@ -79,7 +79,7 @@ public:
     // Association ends from QTimeObservation
     Q_INVOKABLE QNamedElement *event() const;
     Q_INVOKABLE void setEvent(QNamedElement *event);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtransition.cpp b/src/uml/qtransition.cpp
index 5cf721e1..8845bef1 100644
--- a/src/uml/qtransition.cpp
+++ b/src/uml/qtransition.cpp
@@ -620,42 +620,6 @@ bool QTransition::isConsistentWith(const QRedefinableElement *redefinee) const
     return bool(); // change here to your derived return
 }
 
-void QTransition::registerMetaTypes() const
-{
-    qRegisterMetaType<QTrigger *>("QTrigger *");
-    qRegisterMetaType<QSet<QTrigger *>>("QSet<QTrigger *>");
-    qRegisterMetaType<QList<QTrigger *>>("QList<QTrigger *>");
-
-    qRegisterMetaType<QVertex *>("QVertex *");
-    qRegisterMetaType<QSet<QVertex *>>("QSet<QVertex *>");
-    qRegisterMetaType<QList<QVertex *>>("QList<QVertex *>");
-
-    qRegisterMetaType<QStateMachine *>("QStateMachine *");
-    qRegisterMetaType<QSet<QStateMachine *>>("QSet<QStateMachine *>");
-    qRegisterMetaType<QList<QStateMachine *>>("QList<QStateMachine *>");
-
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QRegion *>("QRegion *");
-    qRegisterMetaType<QSet<QRegion *>>("QSet<QRegion *>");
-    qRegisterMetaType<QList<QRegion *>>("QList<QRegion *>");
-
-    qRegisterMetaType<QConstraint *>("QConstraint *");
-    qRegisterMetaType<QSet<QConstraint *>>("QSet<QConstraint *>");
-    qRegisterMetaType<QList<QConstraint *>>("QList<QConstraint *>");
-
-    qRegisterMetaType<QBehavior *>("QBehavior *");
-    qRegisterMetaType<QSet<QBehavior *>>("QSet<QBehavior *>");
-    qRegisterMetaType<QList<QBehavior *>>("QList<QBehavior *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTransition::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTransition")][QString::fromLatin1("kind")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtransition.h b/src/uml/qtransition.h
index 87478e87..d46b9734 100644
--- a/src/uml/qtransition.h
+++ b/src/uml/qtransition.h
@@ -163,7 +163,7 @@ public:
     // Operations
     Q_INVOKABLE QStateMachine *containingStateMachine() const;
     Q_INVOKABLE bool isConsistentWith(const QRedefinableElement *redefinee) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtrigger.cpp b/src/uml/qtrigger.cpp
index 8dddcf59..d8d74520 100644
--- a/src/uml/qtrigger.cpp
+++ b/src/uml/qtrigger.cpp
@@ -138,22 +138,6 @@ void QTrigger::setEvent(QEvent *event)
     }
 }
 
-void QTrigger::registerMetaTypes() const
-{
-    qRegisterMetaType<QEvent *>("QEvent *");
-    qRegisterMetaType<QSet<QEvent *>>("QSet<QEvent *>");
-    qRegisterMetaType<QList<QEvent *>>("QList<QEvent *>");
-
-    qRegisterMetaType<QPort *>("QPort *");
-    qRegisterMetaType<QSet<QPort *>>("QSet<QPort *>");
-    qRegisterMetaType<QList<QPort *>>("QList<QPort *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTrigger::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTrigger")][QString::fromLatin1("ports")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtrigger.h b/src/uml/qtrigger.h
index 683be025..0f7a3043 100644
--- a/src/uml/qtrigger.h
+++ b/src/uml/qtrigger.h
@@ -81,7 +81,7 @@ public:
     Q_INVOKABLE void removePort(QPort *port);
     Q_INVOKABLE QEvent *event() const;
     Q_INVOKABLE void setEvent(QEvent *event);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtype.cpp b/src/uml/qtype.cpp
index 3fc7ff61..94ed7e20 100644
--- a/src/uml/qtype.cpp
+++ b/src/uml/qtype.cpp
@@ -128,18 +128,6 @@ bool QType::conformsTo(const QType *other) const
     return bool(); // change here to your derived return
 }
 
-void QType::registerMetaTypes() const
-{
-    qRegisterMetaType<QPackage *>("QPackage *");
-    qRegisterMetaType<QSet<QPackage *>>("QSet<QPackage *>");
-    qRegisterMetaType<QList<QPackage *>>("QList<QPackage *>");
-
-    QPackageableElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QType::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QType")][QString::fromLatin1("package")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtype.h b/src/uml/qtype.h
index f8ea8352..b926190b 100644
--- a/src/uml/qtype.h
+++ b/src/uml/qtype.h
@@ -76,7 +76,7 @@ public:
 
     // Operations
     Q_INVOKABLE bool conformsTo(const QType *other) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qtypedelement.cpp b/src/uml/qtypedelement.cpp
index 42fc72e3..a19f9b29 100644
--- a/src/uml/qtypedelement.cpp
+++ b/src/uml/qtypedelement.cpp
@@ -106,18 +106,6 @@ void QTypedElement::setType(QType *type)
     }
 }
 
-void QTypedElement::registerMetaTypes() const
-{
-    qRegisterMetaType<QType *>("QType *");
-    qRegisterMetaType<QSet<QType *>>("QSet<QType *>");
-    qRegisterMetaType<QList<QType *>>("QList<QType *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QTypedElement::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QTypedElement")][QString::fromLatin1("type")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qtypedelement.h b/src/uml/qtypedelement.h
index 61acb9eb..6e4a8462 100644
--- a/src/uml/qtypedelement.h
+++ b/src/uml/qtypedelement.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QTypedElement
     Q_INVOKABLE QType *type() const;
     Q_INVOKABLE void setType(QType *type);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qunmarshallaction.cpp b/src/uml/qunmarshallaction.cpp
index 855950d8..43439f90 100644
--- a/src/uml/qunmarshallaction.cpp
+++ b/src/uml/qunmarshallaction.cpp
@@ -175,26 +175,6 @@ void QUnmarshallAction::setUnmarshallType(QClassifier *unmarshallType)
     }
 }
 
-void QUnmarshallAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QUnmarshallAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QUnmarshallAction")][QString::fromLatin1("object")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qunmarshallaction.h b/src/uml/qunmarshallaction.h
index 4cc47853..88e68e18 100644
--- a/src/uml/qunmarshallaction.h
+++ b/src/uml/qunmarshallaction.h
@@ -85,7 +85,7 @@ public:
     Q_INVOKABLE void removeResult(QOutputPin *result);
     Q_INVOKABLE QClassifier *unmarshallType() const;
     Q_INVOKABLE void setUnmarshallType(QClassifier *unmarshallType);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qusage.cpp b/src/uml/qusage.cpp
index 9893ab15..c6fa372f 100644
--- a/src/uml/qusage.cpp
+++ b/src/uml/qusage.cpp
@@ -78,14 +78,6 @@ QUsage::~QUsage()
 {
 }
 
-void QUsage::registerMetaTypes() const
-{
-    QDependency::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QUsage::setPropertyData()
 {
     QDependency::setPropertyData();
diff --git a/src/uml/qusage.h b/src/uml/qusage.h
index 42b726e7..4240340d 100644
--- a/src/uml/qusage.h
+++ b/src/uml/qusage.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QUsage : public QDependency
 public:
     Q_INVOKABLE explicit QUsage(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QUsage();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qusecase.cpp b/src/uml/qusecase.cpp
index 7684c40b..2e21a3bf 100644
--- a/src/uml/qusecase.cpp
+++ b/src/uml/qusecase.cpp
@@ -264,30 +264,6 @@ QSet<QUseCase *> QUseCase::allIncludedUseCases() const
     return QSet<QUseCase *>(); // change here to your derived return
 }
 
-void QUseCase::registerMetaTypes() const
-{
-    qRegisterMetaType<QClassifier *>("QClassifier *");
-    qRegisterMetaType<QSet<QClassifier *>>("QSet<QClassifier *>");
-    qRegisterMetaType<QList<QClassifier *>>("QList<QClassifier *>");
-
-    qRegisterMetaType<QInclude *>("QInclude *");
-    qRegisterMetaType<QSet<QInclude *>>("QSet<QInclude *>");
-    qRegisterMetaType<QList<QInclude *>>("QList<QInclude *>");
-
-    qRegisterMetaType<QExtend *>("QExtend *");
-    qRegisterMetaType<QSet<QExtend *>>("QSet<QExtend *>");
-    qRegisterMetaType<QList<QExtend *>>("QList<QExtend *>");
-
-    qRegisterMetaType<QExtensionPoint *>("QExtensionPoint *");
-    qRegisterMetaType<QSet<QExtensionPoint *>>("QSet<QExtensionPoint *>");
-    qRegisterMetaType<QList<QExtensionPoint *>>("QList<QExtensionPoint *>");
-
-    QBehavioredClassifier::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QUseCase::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QUseCase")][QString::fromLatin1("extensionPoints")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qusecase.h b/src/uml/qusecase.h
index cc80f367..b7299511 100644
--- a/src/uml/qusecase.h
+++ b/src/uml/qusecase.h
@@ -95,7 +95,7 @@ public:
 
     // Operations
     Q_INVOKABLE QSet<QUseCase *> allIncludedUseCases() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qvaluepin.cpp b/src/uml/qvaluepin.cpp
index 7c6533b1..5cf2f3de 100644
--- a/src/uml/qvaluepin.cpp
+++ b/src/uml/qvaluepin.cpp
@@ -114,18 +114,6 @@ void QValuePin::setValue(QValueSpecification *value)
     }
 }
 
-void QValuePin::registerMetaTypes() const
-{
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QInputPin::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QValuePin::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QValuePin")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qvaluepin.h b/src/uml/qvaluepin.h
index 8d0d4b44..d6b1ee4c 100644
--- a/src/uml/qvaluepin.h
+++ b/src/uml/qvaluepin.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QValuePin
     Q_INVOKABLE QValueSpecification *value() const;
     Q_INVOKABLE void setValue(QValueSpecification *value);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qvaluespecification.cpp b/src/uml/qvaluespecification.cpp
index 3b85a2ce..182165d4 100644
--- a/src/uml/qvaluespecification.cpp
+++ b/src/uml/qvaluespecification.cpp
@@ -342,18 +342,6 @@ qint32 QValueSpecification::unlimitedValue() const
     return qint32(); // change here to your derived return
 }
 
-void QValueSpecification::registerMetaTypes() const
-{
-    qRegisterMetaType<QParameterableElement *>("QParameterableElement *");
-    qRegisterMetaType<QSet<QParameterableElement *>>("QSet<QParameterableElement *>");
-    qRegisterMetaType<QList<QParameterableElement *>>("QList<QParameterableElement *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QValueSpecification::setPropertyData()
 {
     QWrappedObject::setPropertyData();
diff --git a/src/uml/qvaluespecification.h b/src/uml/qvaluespecification.h
index 52fb230b..7231c1f0 100644
--- a/src/uml/qvaluespecification.h
+++ b/src/uml/qvaluespecification.h
@@ -118,7 +118,7 @@ public:
     Q_INVOKABLE qreal realValue() const;
     Q_INVOKABLE QString stringValue() const;
     Q_INVOKABLE qint32 unlimitedValue() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qvaluespecificationaction.cpp b/src/uml/qvaluespecificationaction.cpp
index 5a3ca6df..b25a01b0 100644
--- a/src/uml/qvaluespecificationaction.cpp
+++ b/src/uml/qvaluespecificationaction.cpp
@@ -145,22 +145,6 @@ void QValueSpecificationAction::setResult(QOutputPin *result)
     }
 }
 
-void QValueSpecificationAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    qRegisterMetaType<QValueSpecification *>("QValueSpecification *");
-    qRegisterMetaType<QSet<QValueSpecification *>>("QSet<QValueSpecification *>");
-    qRegisterMetaType<QList<QValueSpecification *>>("QList<QValueSpecification *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QValueSpecificationAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QValueSpecificationAction")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qvaluespecificationaction.h b/src/uml/qvaluespecificationaction.h
index d40b4a74..5e633139 100644
--- a/src/uml/qvaluespecificationaction.h
+++ b/src/uml/qvaluespecificationaction.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setValue(QValueSpecification *value);
     Q_INVOKABLE QOutputPin *result() const;
     Q_INVOKABLE void setResult(QOutputPin *result);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qvariable.cpp b/src/uml/qvariable.cpp
index 5e1d1e7c..eb7eda45 100644
--- a/src/uml/qvariable.cpp
+++ b/src/uml/qvariable.cpp
@@ -452,26 +452,6 @@ bool QVariable::isAccessibleBy(const QAction *a) const
     return bool(); // change here to your derived return
 }
 
-void QVariable::registerMetaTypes() const
-{
-    qRegisterMetaType<QActivity *>("QActivity *");
-    qRegisterMetaType<QSet<QActivity *>>("QSet<QActivity *>");
-    qRegisterMetaType<QList<QActivity *>>("QList<QActivity *>");
-
-    qRegisterMetaType<QStructuredActivityNode *>("QStructuredActivityNode *");
-    qRegisterMetaType<QSet<QStructuredActivityNode *>>("QSet<QStructuredActivityNode *>");
-    qRegisterMetaType<QList<QStructuredActivityNode *>>("QList<QStructuredActivityNode *>");
-
-    qRegisterMetaType<QAction *>("QAction *");
-    qRegisterMetaType<QSet<QAction *>>("QSet<QAction *>");
-    qRegisterMetaType<QList<QAction *>>("QList<QAction *>");
-
-    QWrappedObject::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QVariable::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QVariable")][QString::fromLatin1("scope")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qvariable.h b/src/uml/qvariable.h
index f067a840..58d6c357 100644
--- a/src/uml/qvariable.h
+++ b/src/uml/qvariable.h
@@ -138,7 +138,7 @@ public:
 
     // Operations
     Q_INVOKABLE bool isAccessibleBy(const QAction *a) const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qvariableaction.cpp b/src/uml/qvariableaction.cpp
index 2b8bccff..13fe04e2 100644
--- a/src/uml/qvariableaction.cpp
+++ b/src/uml/qvariableaction.cpp
@@ -106,18 +106,6 @@ void QVariableAction::setVariable(QVariable *variable)
     }
 }
 
-void QVariableAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QVariable *>("QVariable *");
-    qRegisterMetaType<QSet<QVariable *>>("QSet<QVariable *>");
-    qRegisterMetaType<QList<QVariable *>>("QList<QVariable *>");
-
-    QAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QVariableAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QVariableAction")][QString::fromLatin1("variable")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qvariableaction.h b/src/uml/qvariableaction.h
index 3c9343ef..e7e3464a 100644
--- a/src/uml/qvariableaction.h
+++ b/src/uml/qvariableaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QVariableAction
     Q_INVOKABLE QVariable *variable() const;
     Q_INVOKABLE void setVariable(QVariable *variable);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qvertex.cpp b/src/uml/qvertex.cpp
index 6854839a..91a05613 100644
--- a/src/uml/qvertex.cpp
+++ b/src/uml/qvertex.cpp
@@ -215,26 +215,6 @@ QStateMachine *QVertex::containingStateMachine() const
     return 0; // change here to your derived return
 }
 
-void QVertex::registerMetaTypes() const
-{
-    qRegisterMetaType<QRegion *>("QRegion *");
-    qRegisterMetaType<QSet<QRegion *>>("QSet<QRegion *>");
-    qRegisterMetaType<QList<QRegion *>>("QList<QRegion *>");
-
-    qRegisterMetaType<QTransition *>("QTransition *");
-    qRegisterMetaType<QSet<QTransition *>>("QSet<QTransition *>");
-    qRegisterMetaType<QList<QTransition *>>("QList<QTransition *>");
-
-    qRegisterMetaType<QStateMachine *>("QStateMachine *");
-    qRegisterMetaType<QSet<QStateMachine *>>("QSet<QStateMachine *>");
-    qRegisterMetaType<QList<QStateMachine *>>("QList<QStateMachine *>");
-
-    QNamedElement::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QVertex::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QVertex")][QString::fromLatin1("incomings")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("none");
diff --git a/src/uml/qvertex.h b/src/uml/qvertex.h
index 34a58611..7ae93b5d 100644
--- a/src/uml/qvertex.h
+++ b/src/uml/qvertex.h
@@ -85,7 +85,7 @@ public:
 
     // Operations
     Q_INVOKABLE QStateMachine *containingStateMachine() const;
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
     // Classes which access read-only opposite properties should be friend
diff --git a/src/uml/qwritelinkaction.cpp b/src/uml/qwritelinkaction.cpp
index 4d873564..ebd89a0c 100644
--- a/src/uml/qwritelinkaction.cpp
+++ b/src/uml/qwritelinkaction.cpp
@@ -78,14 +78,6 @@ QWriteLinkAction::~QWriteLinkAction()
 {
 }
 
-void QWriteLinkAction::registerMetaTypes() const
-{
-    QLinkAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QWriteLinkAction::setPropertyData()
 {
     QLinkAction::setPropertyData();
diff --git a/src/uml/qwritelinkaction.h b/src/uml/qwritelinkaction.h
index 814363fa..29c167e1 100644
--- a/src/uml/qwritelinkaction.h
+++ b/src/uml/qwritelinkaction.h
@@ -64,7 +64,7 @@ class Q_UML_EXPORT QWriteLinkAction : public QLinkAction
 public:
     Q_INVOKABLE explicit QWriteLinkAction(QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     virtual ~QWriteLinkAction();
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qwritestructuralfeatureaction.cpp b/src/uml/qwritestructuralfeatureaction.cpp
index 8281b412..e8bc5659 100644
--- a/src/uml/qwritestructuralfeatureaction.cpp
+++ b/src/uml/qwritestructuralfeatureaction.cpp
@@ -145,22 +145,6 @@ void QWriteStructuralFeatureAction::setValue(QInputPin *value)
     }
 }
 
-void QWriteStructuralFeatureAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QOutputPin *>("QOutputPin *");
-    qRegisterMetaType<QSet<QOutputPin *>>("QSet<QOutputPin *>");
-    qRegisterMetaType<QList<QOutputPin *>>("QList<QOutputPin *>");
-
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QStructuralFeatureAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QWriteStructuralFeatureAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteStructuralFeatureAction")][QString::fromLatin1("result")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qwritestructuralfeatureaction.h b/src/uml/qwritestructuralfeatureaction.h
index 8e8cb628..33f0baea 100644
--- a/src/uml/qwritestructuralfeatureaction.h
+++ b/src/uml/qwritestructuralfeatureaction.h
@@ -77,7 +77,7 @@ public:
     Q_INVOKABLE void setResult(QOutputPin *result);
     Q_INVOKABLE QInputPin *value() const;
     Q_INVOKABLE void setValue(QInputPin *value);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/uml/qwritevariableaction.cpp b/src/uml/qwritevariableaction.cpp
index 293dd1de..1f0c315c 100644
--- a/src/uml/qwritevariableaction.cpp
+++ b/src/uml/qwritevariableaction.cpp
@@ -114,18 +114,6 @@ void QWriteVariableAction::setValue(QInputPin *value)
     }
 }
 
-void QWriteVariableAction::registerMetaTypes() const
-{
-    qRegisterMetaType<QInputPin *>("QInputPin *");
-    qRegisterMetaType<QSet<QInputPin *>>("QSet<QInputPin *>");
-    qRegisterMetaType<QList<QInputPin *>>("QList<QInputPin *>");
-
-    QVariableAction::registerMetaTypes();
-
-    foreach (QWrappedObject *wrappedObject, wrappedObjects())
-        wrappedObject->registerMetaTypes();
-}
-
 void QWriteVariableAction::setPropertyData()
 {
     QWrappedObject::propertyDataHash[QString::fromLatin1("QWriteVariableAction")][QString::fromLatin1("value")][QtWrappedObjects::QtWrappedObjects::AggregationRole] = QString::fromLatin1("composite");
diff --git a/src/uml/qwritevariableaction.h b/src/uml/qwritevariableaction.h
index 0322ce6e..724c99ed 100644
--- a/src/uml/qwritevariableaction.h
+++ b/src/uml/qwritevariableaction.h
@@ -73,7 +73,7 @@ public:
     // Association ends from QWriteVariableAction
     Q_INVOKABLE QInputPin *value() const;
     Q_INVOKABLE void setValue(QInputPin *value);
-    virtual void registerMetaTypes() const;
+
     virtual void setPropertyData();
 
 protected:
diff --git a/src/wrappedobjects/qwrappedobject.cpp b/src/wrappedobjects/qwrappedobject.cpp
index 71d9301d..acc1b5b0 100644
--- a/src/wrappedobjects/qwrappedobject.cpp
+++ b/src/wrappedobjects/qwrappedobject.cpp
@@ -171,10 +171,6 @@ bool QWrappedObject::isPropertyModified(QMetaProperty metaProperty) const
     return d->modifiedResettableProperties.contains(QString::fromLatin1(metaProperty.name()));
 }
 
-void QWrappedObject::registerMetaTypes() const
-{
-}
-
 #include "moc_qwrappedobject.cpp"
 
 QT_END_NAMESPACE_QTWRAPPEDOBJECTS
diff --git a/src/wrappedobjects/qwrappedobject.h b/src/wrappedobjects/qwrappedobject.h
index 26b64a0d..c6fb98a2 100644
--- a/src/wrappedobjects/qwrappedobject.h
+++ b/src/wrappedobjects/qwrappedobject.h
@@ -88,8 +88,6 @@ public:
 
     bool isPropertyModified(QMetaProperty metaProperty) const;
 
-    virtual void registerMetaTypes() const;
-
 protected:
     explicit QWrappedObject(QWrappedObjectPrivate &dd, QWrappedObject *wrapper = 0, QWrappedObject *parent = 0);
     void initialize(QWrappedObject *wrapper);