diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-13 11:49:08 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-13 11:49:08 (GMT) |
| commit | 821c7c1486beb6d5e65bd3ac8ba74752fec37fe8 (patch) | |
| tree | 042ad778ccdfacd2dc1b4751a98e83889e5e10e3 /src/gui/kernel/qmultitouch_mac_p.h | |
| parent | 85fbffa12bcd38b08030561335305c3226312bc6 (diff) | |
| parent | cc24c46c117248ecb98200416e7f25375e6bb476 (diff) | |
| download | Qt-821c7c1486beb6d5e65bd3ac8ba74752fec37fe8.zip Qt-821c7c1486beb6d5e65bd3ac8ba74752fec37fe8.tar.gz Qt-821c7c1486beb6d5e65bd3ac8ba74752fec37fe8.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
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(); |