diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:32:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:32:05 +0100 |
| commit | 63a1b65f7bd7b0bdd6f8fd858e5d9399eab395e4 (patch) | |
| tree | 0751b7717ee66ad57020a5d9d8cedc34f6fcadb0 | |
| parent | 9135dec42de1880bd8b2972ba01f97a219cb0093 (diff) | |
| parent | e4e03650dbbc1f98ba90d15364d9c951a7e7506b (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I07752ae930d5be66dd8d6d1280c2f527a49e41a7
0 files changed, 0 insertions, 0 deletions