feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Disable componentComplete for primitive creation

Browse Source 
Control are now in a qrc file and the component are registered as Qml
types. We are using the primitive creation path in this case so we have
to disable the componentComplete call.

Change-Id: I52936b92d936acbfc21ba800ffca9123fcece864
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-10-23 14:53:51 +02:00
committed by Thomas Hartmann
parent 6f6f970afb
commit a2c0b91ec5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+4
View File
@@ -1015,6 +1015,10 @@ QObject *ObjectNodeInstance::createCustomParserObject(const QString &nodeSource,
QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorNumber, int minorNumber, QQmlContext *context)
{
ComponentCompleteDisabler disableComponentComplete;
Q_UNUSED(disableComponentComplete)
QObject *object = 0;
QQmlType *type = QQmlMetaType::qmlType(typeName.toUtf8(), majorNumber, minorNumber);
if (type) {