summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qsoftkeymanager_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-09 11:51:21 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-09 11:51:21 (GMT)
commit2a1bf99770401576f451806b2e2a8c73853ca99b (patch)
tree642eaf971a216c3dea6169979de89f7624559dce /src/gui/kernel/qsoftkeymanager_p.h
parent6165ab0203fa80d31f3488ead7e7f7c088c8668c (diff)
parent8e38da7771b40f5585e874a8d12b71225be76503 (diff)
downloadQt-2a1bf99770401576f451806b2e2a8c73853ca99b.zip
Qt-2a1bf99770401576f451806b2e2a8c73853ca99b.tar.gz
Qt-2a1bf99770401576f451806b2e2a8c73853ca99b.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: Compile fix for embedded. 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/qsoftkeymanager_p.h')
0 files changed, 0 insertions, 0 deletions