diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:31:34 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:31:34 +0100 |
| commit | 7aef9656318bb5f827be997a526e9effcfb62502 (patch) | |
| tree | d6f7ea8d8c8398ba6aadb50da1b55f122e526781 /src | |
| parent | 462616dffd63bf9605fb99478a4f1e92824bd6c7 (diff) | |
| parent | fa7a65550daf4c1687e0a27f92e452d1cdd95dd3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I7c9aaec71adbf1f0bc040e38b8f2e767022baa81
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions