diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-07 09:55:11 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-07 09:55:11 (GMT) |
| commit | 757e9af177544eaf6b66641ea724716ccd4b2701 (patch) | |
| tree | 84aab0e4c7141b7a25db40838b9cf27829ff9fe8 /doc/src | |
| parent | eeccdc0cec9a616e740e3b59a6f011bfe703ce09 (diff) | |
| parent | 6947390e5d331ae653e91acecad70108915328e7 (diff) | |
| download | Qt-757e9af177544eaf6b66641ea724716ccd4b2701.zip Qt-757e9af177544eaf6b66641ea724716ccd4b2701.tar.gz Qt-757e9af177544eaf6b66641ea724716ccd4b2701.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/declarative/elements.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc index 5eaaf7e..1bb739d 100644 --- a/doc/src/declarative/elements.qdoc +++ b/doc/src/declarative/elements.qdoc @@ -132,6 +132,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \l FocusScope \o \l Flickable \o \l Flipable +\o \l GestureArea (experimental) \endlist \o @@ -194,7 +195,7 @@ The following table lists the QML elements provided by the Qt Declarative module \o \list -\o \l Particles +\o \l Particles (experimental) \list \o \l ParticleMotionLinear \o \l ParticleMotionGravity diff --git a/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp b/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp index 94a9f68..2867bd5a 100644 --- a/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp +++ b/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp @@ -61,5 +61,6 @@ void MyClass::callFinishedSlot(QDBusPendingCallWatcher *call) QByteArray data = reply.argumentAt<1>(); showReply(text, data); } + call->deleteLater(); } //! [1] |