diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 13:51:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-04 13:51:24 +0200 |
| commit | 6f3b8e42ae95291958e2628a33d43aea4eba2b53 (patch) | |
| tree | 05864b6799bfa5b200c9d0a30a557049bf0ee123 /src/plugins/sensors/android/sensormanager.cpp | |
| parent | 4d8d306e3e555da92296cb8ca1b62fcfad0f5268 (diff) | |
| parent | bcc717b9ff5e9832794171217436029479b50f81 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into dev
Conflicts:
.qmake.conf
Change-Id: I6cf814d560665490574bd35d5ebfce911a46270f
Diffstat (limited to 'src/plugins/sensors/android/sensormanager.cpp')
0 files changed, 0 insertions, 0 deletions