diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:31:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:31:20 +0100 |
| commit | 36276fc529529e795df62dae8278013bb4493c25 (patch) | |
| tree | 8bd5f16358f3037ea852910497b142e394c87cc2 /qtsensors.pro | |
| parent | 92c07e09a085b1cfc31f26a6ca9c4f23b9d0b521 (diff) | |
| parent | 233d2d083fc1bca05f6b323e5c3dbc222828d135 (diff) | |
| download | qtsensors-36276fc529529e795df62dae8278013bb4493c25.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I9831f5167703126ffcf4e012a2c034976b5e6b3e
Diffstat (limited to 'qtsensors.pro')
0 files changed, 0 insertions, 0 deletions