diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-07 14:57:38 +0100 |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-07 14:57:38 +0100 |
| commit | d8fb8ca3a378743eebb8464f7910a5e6d1870c01 (patch) | |
| tree | 9c31a017163a532946f10107b8d9f4405ed1c9db /src/gui/kernel/qcocoaview_mac.mm | |
| parent | b5915ef3a6d0417440ad82e9369d6679505b953e (diff) | |
| parent | 076bba6c901e292b61fffb7a91020075dcd84919 (diff) | |
| download | qt4-tools-d8fb8ca3a378743eebb8464f7910a5e6d1870c01.tar.gz | |
Merge branch 'qdoc-simplified' into mimir-simplified
Conflicts:
doc/src/platforms/compiler-notes.qdoc
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/ditaxmlgenerator.h
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/node.cpp
tools/qdoc3/pagegenerator.h
Diffstat (limited to 'src/gui/kernel/qcocoaview_mac.mm')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index a552ce7f6f..f759fe0cc0 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -939,10 +939,6 @@ static int qCocoaViewCount = 0; } } #endif //QT_NO_WHEELEVENT - - if (!wheelOK) { - return [super scrollWheel:theEvent]; - } } - (void)tabletProximity:(NSEvent *)tabletEvent |