diff options
author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-21 05:20:03 (GMT) |
---|---|---|
committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-07-21 05:20:03 (GMT) |
commit | 8079a0c5b4ee6550501476410fab457d63c705b6 (patch) | |
tree | 6d7bb6335ebe494546296911b1ff1239335212b9 /src/gui/kernel/qmultitouch_mac.mm | |
parent | 5a3db7268eb9203e91fc09e5db6d8690274464d7 (diff) | |
parent | 6ca14dce65634e202b36499c76c268c87f78ceb6 (diff) | |
download | Qt-8079a0c5b4ee6550501476410fab457d63c705b6.zip Qt-8079a0c5b4ee6550501476410fab457d63c705b6.tar.gz Qt-8079a0c5b4ee6550501476410fab457d63c705b6.tar.bz2 |
Merge commit 'qt/master' into graphicseffects
Conflicts:
src/gui/graphicsview/graphicsview.pri
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene.h
src/gui/graphicsview/qgraphicsview.cpp
Diffstat (limited to 'src/gui/kernel/qmultitouch_mac.mm')
-rw-r--r-- | src/gui/kernel/qmultitouch_mac.mm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qmultitouch_mac.mm b/src/gui/kernel/qmultitouch_mac.mm index 3fe85a9..3d2eae6 100644 --- a/src/gui/kernel/qmultitouch_mac.mm +++ b/src/gui/kernel/qmultitouch_mac.mm @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE #ifdef QT_MAC_USE_COCOA -QHash<int, QCocoaTouch*> QCocoaTouch::_currentTouches; +QHash<qint64, QCocoaTouch*> QCocoaTouch::_currentTouches; QPointF QCocoaTouch::_screenReferencePos; QPointF QCocoaTouch::_trackpadReferencePos; int QCocoaTouch::_idAssignmentCount = 0; @@ -62,7 +62,7 @@ QCocoaTouch::QCocoaTouch(NSTouch *nstouch) _touchPoint.setId(_idAssignmentCount++); _touchPoint.setPressure(1.0); - _identity = int([nstouch identity]); + _identity = qint64([nstouch identity]); _currentTouches.insert(_identity, this); updateTouchData(nstouch, NSTouchPhaseBegan); } @@ -100,7 +100,7 @@ void QCocoaTouch::updateTouchData(NSTouch *nstouch, NSTouchPhase phase) QCocoaTouch *QCocoaTouch::findQCocoaTouch(NSTouch *nstouch) { - int identity = int([nstouch identity]); + qint64 identity = qint64([nstouch identity]); if (_currentTouches.contains(identity)) return _currentTouches.value(identity); return 0; |