Merge QmlComponentJS into QmlComponent

createComponent() and Component{} are now the same, and so Component{}s
can now be passed around for use in script.

Also this commit fixes the minor bug QT-2386

1 files changed, 1 insertions, 1 deletions

diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml
index ea4e0cd..9bfab0e 100644
--- a/examples/declarative/dynamic/dynamic.qml
+++ b/examples/declarative/dynamic/dynamic.qml
@@ -108,7 +108,7 @@ Item {
             }
             Button {
                 text: "Create"
-                onClicked: {var obj=createQmlObject(qmlText.text, window, 'CustomObject'); obj.parent=window;}
+                onClicked: createQmlObject(qmlText.text, window, 'CustomObject');
             }
         }
     }