diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 08:24:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-25 08:24:19 (GMT) |
| commit | 978daedf73ba7aecf9ea9f83c9108308e4303d6e (patch) | |
| tree | 6b080f34609bebf1cc049eeb1751d3b5141d5881 /src/declarative/qml/qdeclarativecontext_p.h | |
| parent | 675188b766b7b0f7eb65c2e9f3ee7d6017e63453 (diff) | |
| parent | 141c5ea5b14b1499bcfb5e2c39c917e94aa4e23f (diff) | |
| download | Qt-978daedf73ba7aecf9ea9f83c9108308e4303d6e.zip Qt-978daedf73ba7aecf9ea9f83c9108308e4303d6e.tar.gz Qt-978daedf73ba7aecf9ea9f83c9108308e4303d6e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't circumvent onDestruction handlers when clearing expression in delegate cleanup
Fix responseText to check the charset encoding field and also to not
Re-insert and emit the correct NOTIFY signals following the removal
Fix poor flicking behavior with slower flicks.
Alignment of shadow for rich text is broken when using text styles
typo
Setting one dimension of the sourceSize should set the other dimension.
Document calling QObject methods from QML in Extending QML in C++ docs.
Diffstat (limited to 'src/declarative/qml/qdeclarativecontext_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativecontext_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h index c5a039a..6c14feb 100644 --- a/src/declarative/qml/qdeclarativecontext_p.h +++ b/src/declarative/qml/qdeclarativecontext_p.h @@ -113,7 +113,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeContextData public: QDeclarativeContextData(); QDeclarativeContextData(QDeclarativeContext *); - void clearExpressions(); + void clearContext(); void destroy(); void invalidate(); |