diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-19 08:17:02 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-19 08:17:02 +1000 |
| commit | 685df07ff7e357f6848c50cffa311641afdca307 (patch) | |
| tree | 760e1e6f7189513785133071ab408260f09210b4 /src/gui/text/qtextobject.cpp | |
| parent | a359d21a84acc4b7eb73931e47acd4440327be19 (diff) | |
| parent | 4c8c5ef3866723124fe8cf2c8bdd3b846549b129 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QtDBus: Add unit tests for QDBusAbstractAdaptor
QtDBus: Add unit tests for QDBusInterface
QtDBus: Add unit tests for QDBusAbstractInterface
QtDBus: Register QDBusServer connection name in QDBusConnectionManager
QtDBus: Skip bus name check for peer-to-peer connection
QtDBus: Fix minor coding style issues
QtDBus: Add default constructor to QDBusServer
QtDBus: Add unit tests for peer-to-peer connection
QtDBus: Add method QDBusConnection::disconnectFromPeer()
QtDBus: Add method QDBusConnection::connectToPeer()
QtDBus: Fix QDBusConnection::disconnectFromBus() for peer-to-peer connections
QtDBus: Fix bus in peer-to-peer connections should not be used
QtDBus: Fix empty service name in peer-to-peer connections
QtDBus: Fix registering objects using path '/' in peer-to-peer connections
QtDBus: Fix QDBusServer to handle correctly new dbus connections
QtDBus: Cleaning comments, spacing, etc.
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
0 files changed, 0 insertions, 0 deletions