summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qshortcutmap.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-08 13:22:58 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-08 13:22:58 (GMT)
commitf7ad03a30b69143a6670424a756d65860c428430 (patch)
tree618d6875bd4b307078202c7f859febd285a5020b /src/gui/kernel/qshortcutmap.cpp
parentd43d9c0d273911f2222f9d79b8e028458cb7abeb (diff)
parent3abc322eb6834aa61cc77d73dbd17c4389accb00 (diff)
downloadQt-f7ad03a30b69143a6670424a756d65860c428430.zip
Qt-f7ad03a30b69143a6670424a756d65860c428430.tar.gz
Qt-f7ad03a30b69143a6670424a756d65860c428430.tar.bz2
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: Revised fix for system tray popup activation Fixed draggabletext example. Added new mouse cursor types. Doc: more \since 4.7 Doc: add \since 4.7 to new functions.
Diffstat (limited to 'src/gui/kernel/qshortcutmap.cpp')
0 files changed, 0 insertions, 0 deletions