summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qiconengine.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-08 03:45:49 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-08 03:45:49 (GMT)
commit3abc322eb6834aa61cc77d73dbd17c4389accb00 (patch)
tree7fc588eb11bcf8b714e2b9dd845c504c3c19e5d2 /src/gui/image/qiconengine.cpp
parentfe239b32550e83e8a42617457adca8d7922ff92f (diff)
parent9ffdfa58b3ad2ed4100a7d223a85399b72c6deb7 (diff)
downloadQt-3abc322eb6834aa61cc77d73dbd17c4389accb00.zip
Qt-3abc322eb6834aa61cc77d73dbd17c4389accb00.tar.gz
Qt-3abc322eb6834aa61cc77d73dbd17c4389accb00.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/image/qiconengine.cpp')
0 files changed, 0 insertions, 0 deletions