diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-12 06:56:50 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-12 06:56:50 (GMT) |
| commit | 7421702dd3202c21f3871171792476f0d2d50abe (patch) | |
| tree | 5a45e20fd74e23cf0a4ad2aa1a80bd073fa51413 /src/declarative/qml/qmlexpression_p.h | |
| parent | 9094a6588de3a7264ec4647a24b94253a7609823 (diff) | |
| parent | 949e21cdafeec0c0e4ac632ebbf21767479f04e5 (diff) | |
| download | Qt-7421702dd3202c21f3871171792476f0d2d50abe.zip Qt-7421702dd3202c21f3871171792476f0d2d50abe.tar.gz Qt-7421702dd3202c21f3871171792476f0d2d50abe.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlcompiler.cpp
Diffstat (limited to 'src/declarative/qml/qmlexpression_p.h')
| -rw-r--r-- | src/declarative/qml/qmlexpression_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h index 33016e6..d9bb27b 100644 --- a/src/declarative/qml/qmlexpression_p.h +++ b/src/declarative/qml/qmlexpression_p.h @@ -136,7 +136,7 @@ public: }; void init(QmlContext *, const QString &, QObject *); - void init(QmlContext *, void *, QmlRefCount *, QObject *); + void init(QmlContext *, void *, QmlRefCount *, QObject *, const QUrl &, int); QmlExpressionData *data; @@ -150,6 +150,8 @@ public: static QmlExpressionPrivate *get(QmlExpression *expr) { return static_cast<QmlExpressionPrivate *>(QObjectPrivate::get(expr)); } + + static void printException(QScriptEngine *); }; QT_END_NAMESPACE |