diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-24 09:37:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-24 09:37:29 +0100 |
| commit | fb382442ccf1a8e926687b3cfa163ccbca479c46 (patch) | |
| tree | de67adc950fbb8d42056453c3f40ff96bbd69da8 /examples/sensors/sensorgestures/mainwindow.cpp | |
| parent | 8f89e12e90d3f13f243c8dc51442f50e91446371 (diff) | |
| parent | 01186d63a0e585d6eb432271371dd3cd489dc905 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: If889421e172ff4f2f2f562d95518120556bdc97b
Diffstat (limited to 'examples/sensors/sensorgestures/mainwindow.cpp')
0 files changed, 0 insertions, 0 deletions