diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 10:43:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 10:43:29 (GMT) |
| commit | 75f5b49b9a722c5f3827ea538e13a69dff1d8c78 (patch) | |
| tree | 59b8dda72708be8a835c7716cd60b57405553cd1 /src/declarative/qml/qdeclarativeexpression.cpp | |
| parent | 953e91c582cd396082250748e4c4d8424292c1de (diff) | |
| parent | c3557c0fd00f107da77e932ff0f42b5aaa09c1d3 (diff) | |
| download | Qt-75f5b49b9a722c5f3827ea538e13a69dff1d8c78.zip Qt-75f5b49b9a722c5f3827ea538e13a69dff1d8c78.tar.gz Qt-75f5b49b9a722c5f3827ea538e13a69dff1d8c78.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix missing license header
Add test for getting a backtrace in QML
Doc: add link to new gettings started to index.html
Doc: Added new getting started document.
QtDeclarative: Give name to function bindings and signals.
Diffstat (limited to 'src/declarative/qml/qdeclarativeexpression.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeexpression.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index 9935e38..585fb69 100644 --- a/src/declarative/qml/qdeclarativeexpression.cpp +++ b/src/declarative/qml/qdeclarativeexpression.cpp @@ -604,6 +604,7 @@ QScriptValue QDeclarativeExpressionPrivate::scriptValue(QObject *secondaryScope, scriptContext->pushScope(ep->globalClass->staticGlobalObject()); QDeclarativeRewrite::RewriteBinding rewriteBinding; + rewriteBinding.setName(name); bool ok = true; const QString code = rewriteBinding(expression, &ok); if (ok) |