diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:02:32 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-02 03:02:32 +0100 |
| commit | 1579f19830443484c4c51d6924a5b141b4e816e4 (patch) | |
| tree | 99ebfb1c3b7be8a8beeff16f878bad25576c34e5 /src/sensors/qproximitysensor.cpp | |
| parent | d3fb65b35356c41b330974dc74aa6c4254739802 (diff) | |
| parent | 7792137f3fcd400f3933e8f7f328b35aa0586f81 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1v5.13.0-alpha1
Change-Id: I760bb889ea4f2a89496aa6481e7918a992b96b3a
Diffstat (limited to 'src/sensors/qproximitysensor.cpp')
0 files changed, 0 insertions, 0 deletions