diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 10:52:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 10:52:33 (GMT) |
| commit | 47f894350cc48a6fdc4b5cc4c47c4c7f072678f9 (patch) | |
| tree | ed73ede0a8c4041d7c62657072d3b6c639bd142b /doc/src/frameworks-technologies | |
| parent | b915d0aa46599f707df4db6eb33965602a2d7422 (diff) | |
| parent | e0c4899b46a68b37ce743c5a1ffd17596cbaa44c (diff) | |
| download | Qt-47f894350cc48a6fdc4b5cc4c47c4c7f072678f9.zip Qt-47f894350cc48a6fdc4b5cc4c47c4c7f072678f9.tar.gz Qt-47f894350cc48a6fdc4b5cc4c47c4c7f072678f9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Mac: restoreGeometry()
[Regression] Build failure on Mac Carbon
doc: Added some \briefs to how-to docs.
Some 4.7 changes.
Updated changelog.
Cherry pick fix for MOBILITY-932 from Qt Mobility.
Cherry pick fix for MOBILITY-962 from Qt Mobility.
Cherry pick fix for MOBILITY-828 from Qt Mobility.
Bearer management changes from Qt Mobility.
Cherry pick fix for MOBILITY-828 from Qt Mobility.
Added snippet labels to QML Dial example.
Fixed documentation typo.
Diffstat (limited to 'doc/src/frameworks-technologies')
| -rw-r--r-- | doc/src/frameworks-technologies/dbus-adaptors.qdoc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/src/frameworks-technologies/dbus-adaptors.qdoc b/doc/src/frameworks-technologies/dbus-adaptors.qdoc index 11c5998..25c6a43 100644 --- a/doc/src/frameworks-technologies/dbus-adaptors.qdoc +++ b/doc/src/frameworks-technologies/dbus-adaptors.qdoc @@ -43,6 +43,7 @@ \page usingadaptors.html \title Using QtDBus Adaptors \ingroup technology-apis + \brief How to create and use DBus adaptors in Qt. \ingroup best-practices |