diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-23 21:41:20 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-23 21:41:20 +1000 |
| commit | ae2ae7dfe55478f7036dfb9f301cac9f67d89f5c (patch) | |
| tree | e5769499ad031ddf3583a5c4a85701f6859800be /doc/src/snippets/code | |
| parent | 2f5855e8d891a7e93bdb721243f1c0b10fcb5ad9 (diff) | |
| parent | 4be6241d267e6789894f788034dc445b463f9ad0 (diff) | |
| download | qt4-tools-ae2ae7dfe55478f7036dfb9f301cac9f67d89f5c.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Make the DBus timeout configurable in QDBusAbstractInterface.
Add a QApplication::queryKeyboardModifiers() method.
Diffstat (limited to 'doc/src/snippets/code')
0 files changed, 0 insertions, 0 deletions