diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:31:32 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:31:32 +0100 |
| commit | 614d67be158e3ef8443c1b7f3126303cfcf4becc (patch) | |
| tree | df0d138fbe1e7758b8b5c52d1a35faa5f19a0919 | |
| parent | 964a1bb8532249f82d4d647bd496d77ccb5e240f (diff) | |
| parent | f813d6af4e41b8b60652265827c0c06deb888f66 (diff) | |
| download | qtlocation-614d67be158e3ef8443c1b7f3126303cfcf4becc.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I0df7503351f8388d825e3f56e307cbb65de56541
0 files changed, 0 insertions, 0 deletions