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

Conflicts:
	tools/qmlprofiler/qmlprofilerclient.cpp

Change-Id: I1de8832fefd0e45fea16ca072b6c7ae44fa376d4

1 files changed, 6 insertions, 1 deletions

diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
index 89088e5b3e..3acabe390f 100644
--- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
+++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp
@@ -1013,8 +1013,13 @@ ReturnedValue QtObject::method_createQmlObject(CallContext *ctx)
     if (!parentArg)
         V4THROW_ERROR("Qt.createQmlObject(): Missing parent object");
 
+    QQmlTypeData *typeData = QQmlEnginePrivate::get(engine)->typeLoader.getType(
+                qml.toUtf8(), url, QQmlTypeLoader::Synchronous);
+    Q_ASSERT(typeData->isCompleteOrError());
     QQmlComponent component(engine);
-    component.setData(qml.toUtf8(), url);
+    QQmlComponentPrivate *componentPrivate = QQmlComponentPrivate::get(&component);
+    componentPrivate->fromTypeData(typeData);
+    componentPrivate->progress = 1.0;
 
     if (component.isError()) {
         ScopedValue v(scope, Error::create(ctx->d()->engine, component.errors()));