diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2011-10-14 15:55:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-17 18:03:13 +0200 |
| commit | 4521e2ec61c6eddd6d4a8454f84a05d9a3195f4b (patch) | |
| tree | b872d62023e05c9299a491259abdedb72c783a73 /src/plugins/platforms/xcb/xcb.pro | |
| parent | 09cad13e49a9b6e6be565854fa4404d604939c03 (diff) | |
Add multipoint touch support for Harmattan to the xcb platform plugin.
Proper multipoint touch support was only introduced in XInput2.1, but Harmattan uses
a tweaked version of XInput2.0 that transfers touch data through mouse events.
This patch applies on the xcb plugin a subset of the changes that were applied on the
Qt 4.7 that was shipped to Harmattan to get similar multipoint touch support.
Change-Id: Ifda7ad40de29d7ded1443d4f78b3ec3807303a9f
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/xcb.pro')
| -rw-r--r-- | src/plugins/platforms/xcb/xcb.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro index 13fe5b900c..2498581eb7 100644 --- a/src/plugins/platforms/xcb/xcb.pro +++ b/src/plugins/platforms/xcb/xcb.pro @@ -45,6 +45,13 @@ contains(QT_CONFIG, xcb-poll-for-queued-event) { contains(QT_CONFIG, xcb-xlib) { DEFINES += XCB_USE_XLIB LIBS += -lX11 -lX11-xcb + + linux-g++-maemo:contains(QT_CONFIG, xinput2) { + # XInput2 support for Harmattan. + DEFINES += XCB_USE_XINPUT2_MAEMO + SOURCES += qxcbconnection_maemo.cpp + LIBS += -lXi + } } # to support custom cursors with depth > 1 |