Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Fix FolderListModel test - set folder to one containing files.
  Drag over bounds errors when ListView has variable height content
  FolderListModel emitted incorrect rowsRemoved range causing crash.
  fix/improve docs for new QtQuick 1.1 attributes
  Fix test instability.
  Document BorderImage::asynchronous
  Ensure layout is updated when section property changes.
  QDeclarativeDebug: Export needed symbols on Symbian
  Add a 'CursorPosition' parameter to TextInput.positionAt().
  Fix qmlviewer compilation on old Symbian platforms

1 files changed, 2 insertions, 5 deletions

diff --git a/doc/src/snippets/declarative/componentCreation.js b/doc/src/snippets/declarative/componentCreation.js
index cf59777..7364139 100644
--- a/doc/src/snippets/declarative/componentCreation.js
+++ b/doc/src/snippets/declarative/componentCreation.js
@@ -32,13 +32,10 @@ function createSpriteObjects() {
 //![finishCreation]
 function finishCreation() {
     if (component.status == Component.Ready) {
-        sprite = component.createObject(appWindow);
+        sprite = component.createObject(appWindow, {"x": 100, "y": 100});
         if (sprite == null) {
             // Error Handling
-        } else {
-            sprite.x = 100;
-            sprite.y = 100;
-            // ...
+            console.log("Error creating object");
         }
     } else if (component.status == Component.Error) {
         // Error Handling