diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-11 22:48:10 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-11 22:48:10 (GMT) |
| commit | 76b29d542e13184da81129ea3f7373ffd71ceedc (patch) | |
| tree | c18a7af8ae2f70d6fcda5b74cd00161241596beb /src/declarative/qml/qmlcontext_p.h | |
| parent | ac507b4752dcd065038130d224910a6dc64f8f37 (diff) | |
| parent | 76448b41bb9c6212d2534f0597f9973c881c77bd (diff) | |
| download | Qt-76b29d542e13184da81129ea3f7373ffd71ceedc.zip Qt-76b29d542e13184da81129ea3f7373ffd71ceedc.tar.gz Qt-76b29d542e13184da81129ea3f7373ffd71ceedc.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlcontext_p.h')
| -rw-r--r-- | src/declarative/qml/qmlcontext_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlcontext_p.h b/src/declarative/qml/qmlcontext_p.h index d18bfda..9a77e94 100644 --- a/src/declarative/qml/qmlcontext_p.h +++ b/src/declarative/qml/qmlcontext_p.h @@ -91,10 +91,9 @@ public: QObjectList defaultObjects; int highPriorityCount; - QScriptValue scriptValue; - QList<QScriptValue> scripts; - void addScript(const QString &script, QObject *scope); + void addScript(const QString &script, QObject *scope, + const QString &fileName = QString(), int lineNumber = 1); QUrl url; |