diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:03:33 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:04:12 +0100 |
commit | e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2b (patch) | |
tree | 57ba879c11fc275dd6650a3e227458f0b0dc7260 /src/imports | |
parent | d87fdee381318de4d8db10dd0a502dc9c0965623 (diff) | |
parent | dcc4d0b58a4fe0432d3ac86f1f2bd132e40be424 (diff) | |
download | qtsensors-446dbb5b16f4196b5d908a6f0d6b32765a1fea7c.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: I62b5d4414939e0a67ba3271fee71ed9c7ccce5fb
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions