summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/qt
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-04-26 15:45:40 -0700
committerBen Murdoch <benm@google.com>2010-04-28 08:46:45 +0100
commit02d657c513b78a755390e1c5bcf35f6f35f466ca (patch)
tree61fbd5baa4979af022a0bc71dfc6f6b845975e3d /WebCore/platform/qt
parente95c070f82eadda193a0c0efaec7e63fa00e75ce (diff)
downloadexternal_webkit-02d657c513b78a755390e1c5bcf35f6f35f466ca.zip
external_webkit-02d657c513b78a755390e1c5bcf35f6f35f466ca.tar.gz
external_webkit-02d657c513b78a755390e1c5bcf35f6f35f466ca.tar.bz2
Removing the TouchStationary state from PlatformTouchPoint resulted
in unforseen build problems upstream at webkit.org so it was reverted. This change implements the revert inside WebCore. As we only support single touch on Android, we still do not use the TouchStationary event so we keep it removed from the WebKit/android layer. Change-Id: I9e3185de42c21bd50e9c206fa7e6d46d50e037e1
Diffstat (limited to 'WebCore/platform/qt')
-rw-r--r--WebCore/platform/qt/PlatformTouchPointQt.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/WebCore/platform/qt/PlatformTouchPointQt.cpp b/WebCore/platform/qt/PlatformTouchPointQt.cpp
index 6afe4a1..c293212 100644
--- a/WebCore/platform/qt/PlatformTouchPointQt.cpp
+++ b/WebCore/platform/qt/PlatformTouchPointQt.cpp
@@ -35,6 +35,7 @@ PlatformTouchPoint::PlatformTouchPoint(const QTouchEvent::TouchPoint& point)
case Qt::TouchPointReleased: m_state = TouchReleased; break;
case Qt::TouchPointMoved: m_state = TouchMoved; break;
case Qt::TouchPointPressed: m_state = TouchPressed; break;
+ case Qt::TouchPointStationary: m_state = TouchStationary; break;
}
m_screenPos = point.screenPos().toPoint();
m_pos = point.pos().toPoint();