diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:20:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:20:20 +0100 |
| commit | eac98142a197c1bddf9aed1ab4f64270e5e7ea67 (patch) | |
| tree | c5d6daf43081d16aaad74d952aa7dbfd83a0ba84 | |
| parent | 8b93458ffffa5766cf31a64dbb39e8ce2c2969b8 (diff) | |
| parent | f2dde34d7d97616e027d7e37c7d6ef098723c2a1 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I257eab9474deaac5fec271bbd28fe9cc4ded7d72
0 files changed, 0 insertions, 0 deletions