Merge master into api_changes

Conflicts:
	src/qml/debugger/qqmlenginedebugservice.cpp
	src/qml/debugger/qqmlprofilerservice_p.h
	src/qml/qml/qqmlboundsignal.cpp
	src/qml/qml/qqmlpropertycache.cpp
	src/quick/util/qquickimageprovider.cpp

Change-Id: I0609aa5ed54c7769f1e2773a96a7cd43a69f133c

1 files changed, 10 insertions, 10 deletions

diff --git a/src/qml/qml/v4/qv4irbuilder.cpp b/src/qml/qml/v4/qv4irbuilder.cpp
index ea4d1afbbc..453120c6c7 100644
--- a/src/qml/qml/v4/qv4irbuilder.cpp
+++ b/src/qml/qml/v4/qv4irbuilder.cpp
@@ -428,18 +428,18 @@ bool QV4IRBuilder::visit(AST::IdentifierExpression *ast)
         if (r.isValid()) {
             if (r.type) {
                 _expr.code = _block->ATTACH_TYPE(name, r.type, IR::Name::ScopeStorage, line, column);
-            } /*else if (r.importNamespace) {
+            } else if (r.importNamespace) {
                 QQmlMetaType::ModuleApiInstance *moduleApi = m_expression->importCache->moduleApi(r.importNamespace);
-                if (moduleApi) {
-                    if (moduleApi->qobjectCallback) {
-                        moduleApi->qobjectApi = moduleApi->qobjectCallback(QQmlEnginePrivate::get(m_engine), QQmlEnginePrivate::get(m_engine));
-                        moduleApi->qobjectCallback = 0;
-                        moduleApi->scriptCallback = 0;
-                    }
-                    if (moduleApi->qobjectApi)
-                        _expr.code = _block->MODULE_OBJECT(name, moduleApi->qobjectApi->metaObject(), IR::Name::MemberStorage, line, column);
+                if (moduleApi && moduleApi->instanceMetaObject) {
+                    // Note: we don't need to check moduleApi->qobjectCallback here, since
+                    // we did that check in registerModuleApi() in qqmlmetatype.cpp.
+                    // We cannot create the QObject Module Api Instance here,
+                    // as we might be running in a loader thread.
+                    // Thus, V4 can only handle bindings which use Module APIs which
+                    // were registered with the templated registration function.
+                    _expr.code = _block->MODULE_OBJECT(name, moduleApi->instanceMetaObject, IR::Name::MemberStorage, line, column);
                 }
-            }*/ //### we can't create the actual QObject here, as we may be running in a thread (can be reenabled once QTBUG-24894 is handled)
+            }
             // We don't support anything else
         } else {
             bool found = false;