Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I11ea57222ba5aa683b7bfd7735fbc1d2cf86e875

1 files changed, 7 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 47cd36b8f6..56252ec1ab 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -913,7 +913,7 @@ QQuickWorkerScriptEngine *QQmlEnginePrivate::getWorkerScriptEngine()
 
   Note that the \l {Qt Quick 1} version is called QDeclarativeEngine.
 
-  \sa QQmlComponent, QQmlContext
+  \sa QQmlComponent, QQmlContext, {QML Global Object}
 */
 
 /*!
@@ -1435,7 +1435,8 @@ QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object, bool cre
     if (rv || !create)
         return rv;
 
-    QQmlAttachedPropertiesFunc pf = QQmlMetaType::attachedPropertiesFuncById(id);
+    QQmlEnginePrivate *engine = QQmlEnginePrivate::get(data->context);
+    QQmlAttachedPropertiesFunc pf = QQmlMetaType::attachedPropertiesFuncById(engine, id);
     if (!pf)
         return 0;
 
@@ -1450,8 +1451,10 @@ QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object, bool cre
 QObject *qmlAttachedPropertiesObject(int *idCache, const QObject *object,
                                      const QMetaObject *attachedMetaObject, bool create)
 {
-    if (*idCache == -1)
-        *idCache = QQmlMetaType::attachedPropertiesFuncId(attachedMetaObject);
+    if (*idCache == -1) {
+        QQmlEngine *engine = object ? qmlEngine(object) : 0;
+        *idCache = QQmlMetaType::attachedPropertiesFuncId(engine ? QQmlEnginePrivate::get(engine) : 0, attachedMetaObject);
+    }
 
     if (*idCache == -1 || !object)
         return 0;