summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine.h
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-07-02 04:00:06 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-07-02 04:00:06 (GMT)
commit113d2b5d82736c503657f15a3ee56d4daf1829ed (patch)
tree8c2dcc3f0505724a28ac83747b02bb1b7bcae683 /src/declarative/qml/qmlengine.h
parent49c339cfebdab26e6239335a45ca9f3e852f254b (diff)
downloadQt-113d2b5d82736c503657f15a3ee56d4daf1829ed.zip
Qt-113d2b5d82736c503657f15a3ee56d4daf1829ed.tar.gz
Qt-113d2b5d82736c503657f15a3ee56d4daf1829ed.tar.bz2
Improve JS dynamic creation
Renamed evalQml to be consistent with us, not javascript. Fixed bug where createComponent never had the right path. createQmlObject (evalQml) now has a parent as a argument. It also still has a bug where that parent doesnt get set properly, although it is used as the creation context also.
Diffstat (limited to 'src/declarative/qml/qmlengine.h')
-rw-r--r--src/declarative/qml/qmlengine.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index f114379..f600520 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -91,7 +91,7 @@ public:
static QScriptValue qmlScriptObject(QObject*, QmlEngine*);
static QScriptValue createComponent(QScriptContext*, QScriptEngine*);
- static QScriptValue createQMLObject(QScriptContext*, QScriptEngine*);
+ static QScriptValue createQmlObject(QScriptContext*, QScriptEngine*);
private:
// LK: move to the private class