Conflicts: src/corelib/kernel/qcoreapplication.cpp src/corelib/thread/qthread_unix.cpp Change-Id: Ia08d613c3f0bd08cb6dc3e3a57257207dfd4a099 |
||
|---|---|---|
| .. | ||
| evdevkeyboard | ||
| evdevmouse | ||
| evdevtablet | ||
| evdevtouch | ||
| libinput | ||
| tslib | ||
| input.pri | ||
Conflicts: src/corelib/kernel/qcoreapplication.cpp src/corelib/thread/qthread_unix.cpp Change-Id: Ia08d613c3f0bd08cb6dc3e3a57257207dfd4a099 |
||
|---|---|---|
| .. | ||
| evdevkeyboard | ||
| evdevmouse | ||
| evdevtablet | ||
| evdevtouch | ||
| libinput | ||
| tslib | ||
| input.pri | ||