diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 14:34:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-03 14:34:47 (GMT) |
| commit | d3f600eb98b681fd2fe5d968bef59dd10464cb32 (patch) | |
| tree | 0c6afa26b71749e5833355ecb9a360f32951722b /src/3rdparty | |
| parent | dfb56c408b2561c194922f36a0d08c2dc7c43f9b (diff) | |
| parent | 79c6710c7785d915f64bd31e28ce48eed8493a41 (diff) | |
| download | Qt-d3f600eb98b681fd2fe5d968bef59dd10464cb32.zip Qt-d3f600eb98b681fd2fe5d968bef59dd10464cb32.tar.gz Qt-d3f600eb98b681fd2fe5d968bef59dd10464cb32.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: (23 commits)
Removed the unfinished sentence. Fix for QTBUG-10173.
Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071 and QTBUG-10173
Unbreak QImage::rgbSwapped() for many image formats.
Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa)
Doc: Adding content to installation guide and fixing printing bugs
Cocoa: Active QDockWidget does not stay on top of inactive QDockWidget
Made changes to qdoc to allow it to accept a "style level" flag
Doc: Correcting bugs in the CSS
Return 'Unknown' bearer type name for unknown bearer type.
Update def files.
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
...
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/libconninet/src/dbusdispatcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/libconninet/src/dbusdispatcher.cpp b/src/3rdparty/libconninet/src/dbusdispatcher.cpp index 7581982..f5b830a 100644 --- a/src/3rdparty/libconninet/src/dbusdispatcher.cpp +++ b/src/3rdparty/libconninet/src/dbusdispatcher.cpp @@ -31,7 +31,7 @@ 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. |