summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qcocoamenu_mac_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-30 22:12:26 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-30 22:12:26 (GMT)
commitd3ae6c620876e08ed130606709c208f7352b2f81 (patch)
tree80162b139e7cbbed428b7391971199076a9454ab /src/gui/widgets/qcocoamenu_mac_p.h
parent2a79ec7e2223257dd35fbdfd3c92d95c599a115e (diff)
parentec50421c7c592b2365a1f3d4c3dd251b145681e7 (diff)
downloadQt-d3ae6c620876e08ed130606709c208f7352b2f81.zip
Qt-d3ae6c620876e08ed130606709c208f7352b2f81.tar.gz
Qt-d3ae6c620876e08ed130606709c208f7352b2f81.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Reformat whitespace according to coding style QGraphicsView: Handle wheelEvents correctly with Qt::Popup widgets. QGraphicsProxyWidget: Fixes QComboBox popup closing issue.
Diffstat (limited to 'src/gui/widgets/qcocoamenu_mac_p.h')
0 files changed, 0 insertions, 0 deletions