diff options
Diffstat (limited to 'src/qml/qml/v4/qv4bindings.cpp')
-rw-r--r-- | src/qml/qml/v4/qv4bindings.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/qml/qml/v4/qv4bindings.cpp b/src/qml/qml/v4/qv4bindings.cpp index c0e0f22fad..9b74c2aa72 100644 --- a/src/qml/qml/v4/qv4bindings.cpp +++ b/src/qml/qml/v4/qv4bindings.cpp @@ -949,15 +949,15 @@ void QV4Bindings::run(int instrIndex, quint32 &executedBlocks, reg.cleanupString(); if (r.isValid() && r.importNamespace) { - QQmlMetaType::ModuleApiInstance *moduleApi = context->imports->moduleApi(r.importNamespace); - if (moduleApi) { - if (moduleApi->qobjectCallback) { - moduleApi->qobjectApi = moduleApi->qobjectCallback(context->engine, context->engine); - moduleApi->qobjectCallback = 0; - moduleApi->scriptCallback = 0; + QQmlMetaType::SingletonInstance *singletonType = context->imports->singletonType(r.importNamespace); + if (singletonType) { + if (singletonType->qobjectCallback) { + singletonType->qobjectApi = singletonType->qobjectCallback(context->engine, context->engine); + singletonType->qobjectCallback = 0; + singletonType->scriptCallback = 0; } - if (moduleApi->qobjectApi) - reg.setQObject(moduleApi->qobjectApi); + if (singletonType->qobjectApi) + reg.setQObject(singletonType->qobjectApi); } } } |