summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorKimmo Ollila <kimmo.ollila@qt.io>2017-05-29 12:23:08 +0300
committerKimmo Ollila <kimmo.ollila@qt.io>2017-05-30 10:38:12 +0000
commit88f30250eb15b520415658c6c32f48fda111b6bf (patch)
tree20fae3354c5bf73d3bb4eafb67114ec366404945 /src/gui
parent64a4216254a49ae0ba946717599c4f52dac978c5 (diff)
Add USB HID device feature to INTEGRITY
This change adds USB mouse handling support for INTEGRITY Change-Id: I8a2a51c8c3578898e90dd5bbb01f6aed6c64e2a4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io> Reviewed-by: Nikola Velinov <nvelinov@ghs.com> Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Tero Alamaki <tero.alamaki@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/configure.json13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index cbf2315af4..af5dcf8961 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -149,6 +149,13 @@
{ "type": "pkgConfig", "args": "libinput" }
]
},
+ "integrityhid": {
+ "label": "integrityhid",
+ "test": "qpa/integrityhid",
+ "sources": [
+ { "libs": "-lhiddev -lusbhid -lusb" }
+ ]
+ },
"libjpeg": {
"label": "libjpeg",
"test": "unix/libjpeg",
@@ -528,6 +535,11 @@
"condition": "features.libudev && libs.libinput",
"output": [ "privateFeature" ]
},
+ "integrityhid": {
+ "label": "INTEGRITY HID",
+ "condition": "config.integrity && libs.integrityhid",
+ "output": [ "privateFeature" ]
+ },
"libinput-axis-api": {
"label": "axis API in libinput",
"condition": "features.libinput && tests.libinput_axis_api",
@@ -1115,6 +1127,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
"entries": [
"evdev",
"libinput",
+ "integrityhid",
"mtdev",
"tslib",
"xkbcommon-evdev"