summaryrefslogtreecommitdiffstats
path: root/src/compositor/wayland_wrapper/wlinputdevice.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-03-28 13:58:04 +0300
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-03-28 14:09:57 +0200
commitb1cae1062d8ed70b2e72b2c25979847ebdf48323 (patch)
tree3f188f52e060a351bf3401c2b8a3f3fdcf8d47ec /src/compositor/wayland_wrapper/wlinputdevice.cpp
parent79c2ec81c22c54e04391fd43c3fafa4a140cfc6f (diff)
Change the touch extension to be always available.
Not opt-in anymore. Clients that connect to the extension will get the extended touch events, others will get the regular events. Change-Id: I91daec1949814fff5cfa0ebcc82c0977eee963b7 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper/wlinputdevice.cpp')
-rw-r--r--src/compositor/wayland_wrapper/wlinputdevice.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/compositor/wayland_wrapper/wlinputdevice.cpp b/src/compositor/wayland_wrapper/wlinputdevice.cpp
index 3c23d484e..2e0f4b883 100644
--- a/src/compositor/wayland_wrapper/wlinputdevice.cpp
+++ b/src/compositor/wayland_wrapper/wlinputdevice.cpp
@@ -199,10 +199,8 @@ void InputDevice::sendFullTouchEvent(QTouchEvent *event)
}
TouchExtensionGlobal *ext = m_compositor->touchExtension();
- if (ext) {
- ext->postTouchEvent(event, mouseFocus());
+ if (ext && ext->postTouchEvent(event, mouseFocus()))
return;
- }
const QList<QTouchEvent::TouchPoint> points = event->touchPoints();
if (points.isEmpty())