summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPrasanth Ullattil <prasanth.ullattil@nokia.com>2009-09-28 20:49:12 (GMT)
committerPrasanth Ullattil <prasanth.ullattil@nokia.com>2009-09-28 20:58:39 (GMT)
commit679a6b373a5496c069b1ed668f7eb166237bd0e2 (patch)
treec59c5510b97c06027176d49ac5b40ecd2f393e9f
parente20c832098d98076a0f988ce01b53586e370d272 (diff)
downloadQt-679a6b373a5496c069b1ed668f7eb166237bd0e2.zip
Qt-679a6b373a5496c069b1ed668f7eb166237bd0e2.tar.gz
Qt-679a6b373a5496c069b1ed668f7eb166237bd0e2.tar.bz2
QWheelEvent not working on Cocoa 64Bit
The patch which added support for smooth scrolling will work only on 32 bit builds. The new methods (e.g. deviceDeltaX) of the NSEvent were added with the float return type. This should be of CGFloat type instead, which is different from float on 64 bit builds. Reviewed-by: Trust Me
-rw-r--r--src/gui/kernel/qcocoaview_mac.mm6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 4ebf8a9..f482d1c 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -64,9 +64,9 @@
#include <qdebug.h>
@interface NSEvent (DeviceDelta)
- - (float)deviceDeltaX;
- - (float)deviceDeltaY;
- - (float)deviceDeltaZ;
+ - (CGFloat)deviceDeltaX;
+ - (CGFloat)deviceDeltaY;
+ - (CGFloat)deviceDeltaZ;
@end
QT_BEGIN_NAMESPACE