diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-01-25 13:26:14 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-01-25 13:26:14 (GMT) |
| commit | 195fbdfb7f9a8ade3347a651090722a7d3ecccfb (patch) | |
| tree | afd29e9eda1c4f898b1e6e78f23140e87454cdb5 /src/plugins/bearer/icd | |
| parent | 9657c4fa2040758b8aa3a5f7f7c81442cbaba621 (diff) | |
| parent | 67fbf125f3f96ea0ff0da66b1dd8b7dd348ca69f (diff) | |
| download | Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.zip Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.tar.gz Qt-195fbdfb7f9a8ade3347a651090722a7d3ecccfb.tar.bz2 | |
Merge branch '4.7' into jpasions-qt-doc-team-qtquick-4.7
Conflicts:
doc/src/declarative/extending.qdoc
doc/src/external-resources.qdoc
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativetransition.cpp
Diffstat (limited to 'src/plugins/bearer/icd')
| -rw-r--r-- | src/plugins/bearer/icd/dbusdispatcher.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/bearer/icd/dbusdispatcher.cpp b/src/plugins/bearer/icd/dbusdispatcher.cpp index 5fc2a38..5f9be74 100644 --- a/src/plugins/bearer/icd/dbusdispatcher.cpp +++ b/src/plugins/bearer/icd/dbusdispatcher.cpp @@ -51,10 +51,10 @@ namespace Maemo { /*! - \class DBusDispatcher + \class Maemo::DBusDispatcher - \brief DBusDispatcher is a class, which is able to send DBUS method call - messages and receive unicast signals from DBUS object. + \brief DBusDispatcher is a class that can send DBUS method call + messages and receive unicast signals from DBUS objects. */ class DBusDispatcherPrivate |