diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:08:40 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-30 11:08:40 +0100 |
| commit | 9f8d1c7c333651035a7802f434a6376072173685 (patch) | |
| tree | d9e0697821000562af4b9646ad2d01a042db1f1e | |
| parent | 1d2bc8ff809dfec1d0f40070a0352eac5d1e9d3a (diff) | |
| parent | 22f309edd11b6c7b1c306eec9d14cbf7fc766c87 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I223f69d86405299707b01205e95a217075d911f7
0 files changed, 0 insertions, 0 deletions