diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 19:03:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 19:03:09 (GMT) |
| commit | 04cdab146c2c1408fa621eb706c9eb01bb425d69 (patch) | |
| tree | a5a436f95f037149d440793f332d27619d1ceb66 /src/3rdparty | |
| parent | b22e564844fdba82ddea665c55d0498a4caa1b14 (diff) | |
| parent | db6eb60eb0246b1c938e22012be15a317fa64342 (diff) | |
| download | Qt-04cdab146c2c1408fa621eb706c9eb01bb425d69.zip Qt-04cdab146c2c1408fa621eb706c9eb01bb425d69.tar.gz Qt-04cdab146c2c1408fa621eb706c9eb01bb425d69.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:
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.
Simplify network manager settings code.
Use an enum to return the bearer type of a network configuration.
Rename QNetworkConfiguration::bearerName() function.
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. |