summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-18 16:14:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-18 16:14:32 (GMT)
commite76e1714ba9b0cc006690f0c3786e6f96c2e2ada (patch)
tree9d1e59f5653ef8d4dc9b6a63fc93ec26e43af79a /tools/qdoc3
parent0033043d6ad966944365f1bafc7f1ef7191a0edb (diff)
parente58a402fbee2fc8af8cd651acafdc28525ed1314 (diff)
downloadQt-e76e1714ba9b0cc006690f0c3786e6f96c2e2ada.zip
Qt-e76e1714ba9b0cc006690f0c3786e6f96c2e2ada.tar.gz
Qt-e76e1714ba9b0cc006690f0c3786e6f96c2e2ada.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: Make the DBus timeout configurable in QDBusAbstractInterface. Add a QApplication::queryKeyboardModifiers() method. Disabled splitscreen translation still moves screen
Diffstat (limited to 'tools/qdoc3')
0 files changed, 0 insertions, 0 deletions