Merge branch 'stable' into dev

Conflicts:
	sync.profile
	tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp

Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f

1 files changed, 45 insertions, 0 deletions

diff --git a/src/doc/src/snippets/declarative/componentCreation.js b/src/doc/src/snippets/declarative/componentCreation.js
new file mode 100644
index 00000000..7364139d
--- /dev/null
+++ b/src/doc/src/snippets/declarative/componentCreation.js
@@ -0,0 +1,45 @@
+//![vars]
+var component;
+var sprite;
+//![vars]
+
+//![func]
+function createSpriteObjects() {
+//![func]
+
+//![remote]
+    component = Qt.createComponent("Sprite.qml");
+    if (component.status == Component.Ready)
+        finishCreation();
+    else
+        component.statusChanged.connect(finishCreation);
+//![remote]
+
+//![local]
+    component = Qt.createComponent("Sprite.qml");
+    sprite = component.createObject(appWindow, {"x": 100, "y": 100});
+
+    if (sprite == null) {
+        // Error Handling
+        console.log("Error creating object");
+    }
+//![local]
+
+//![func-end]
+}
+//![func-end]
+
+//![finishCreation]
+function finishCreation() {
+    if (component.status == Component.Ready) {
+        sprite = component.createObject(appWindow, {"x": 100, "y": 100});
+        if (sprite == null) {
+            // Error Handling
+            console.log("Error creating object");
+        }
+    } else if (component.status == Component.Error) {
+        // Error Handling
+        console.log("Error loading component:", component.errorString());
+    }
+}
+//![finishCreation]