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

QmlPuppet: Move ComponentCompleteDisabler into QmlPrivateGate

Browse Source 
Change-Id: I71aba092fde0e8026b69a463892b2421c69fb514
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-05-19 10:15:40 +02:00
committed by Thomas Hartmann
parent beec481241
commit c4489a19b4
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+3 -3
View File
@@ -746,7 +746,7 @@ QObject *ObjectNodeInstance::createPrimitive(const QString &typeName, int majorN
QObject *ObjectNodeInstance::createComponentWrap(const QString &nodeSource, const QByteArray &importCode, QQmlContext *context)
{
ComponentCompleteDisabler disableComponentComplete;
QmlPrivateGate::ComponentCompleteDisabler disableComponentComplete;
Q_UNUSED(disableComponentComplete)
QQmlComponent *component = new QQmlComponent(context->engine());
@@ -797,7 +797,7 @@ static inline QString fixComponentPathForIncompatibleQt(const QString &component
QObject *ObjectNodeInstance::createComponent(const QString &componentPath, QQmlContext *context)
{
ComponentCompleteDisabler disableComponentComplete;
QmlPrivateGate::ComponentCompleteDisabler disableComponentComplete;
Q_UNUSED(disableComponentComplete)
@@ -825,7 +825,7 @@ QObject *ObjectNodeInstance::createComponent(const QUrl &componentUrl, QQmlConte
QObject *ObjectNodeInstance::createCustomParserObject(const QString &nodeSource, const QByteArray &importCode, QQmlContext *context)
{
ComponentCompleteDisabler disableComponentComplete;
QmlPrivateGate::ComponentCompleteDisabler disableComponentComplete;
Q_UNUSED(disableComponentComplete)
QQmlComponent component(context->engine());