diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-10 14:36:53 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-10 14:37:59 (GMT) |
| commit | 577b3d7efc56f23dcf2b377816caa7d1aa3c7f88 (patch) | |
| tree | 19c3c7ffba1cee40c5b11121c8d65f7da8eea97a /src/gui/kernel/qmultitouch_mac_p.h | |
| parent | 364aa2a21512d32f3f4271f438e3a6fa799c1e9e (diff) | |
| download | Qt-577b3d7efc56f23dcf2b377816caa7d1aa3c7f88.zip Qt-577b3d7efc56f23dcf2b377816caa7d1aa3c7f88.tar.gz Qt-577b3d7efc56f23dcf2b377816caa7d1aa3c7f88.tar.bz2 | |
Fix compilation on SnowLeopard
On 64-bit an id (void *) is 64-bit also, so, it really should be a
pointer, but I'll make it a 64-bit int for the time being just so stuff
compiles.
Diffstat (limited to 'src/gui/kernel/qmultitouch_mac_p.h')
| -rw-r--r-- | src/gui/kernel/qmultitouch_mac_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qmultitouch_mac_p.h b/src/gui/kernel/qmultitouch_mac_p.h index 3fa8f6c..618e9ca 100644 --- a/src/gui/kernel/qmultitouch_mac_p.h +++ b/src/gui/kernel/qmultitouch_mac_p.h @@ -74,7 +74,7 @@ class QCocoaTouch static void setMouseInDraggingState(bool inDraggingState); private: - static QHash<int, QCocoaTouch*> _currentTouches; + static QHash<qint64, QCocoaTouch*> _currentTouches; static QPointF _screenReferencePos; static QPointF _trackpadReferencePos; static int _idAssignmentCount; @@ -82,7 +82,7 @@ class QCocoaTouch static bool _updateInternalStateOnly; QTouchEvent::TouchPoint _touchPoint; - int _identity; + qint64 _identity; QCocoaTouch(NSTouch *nstouch); ~QCocoaTouch(); |