diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:32:48 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:32:48 +0100 |
| commit | 5587117016d7b98742e7b19afc3a3ee155358176 (patch) | |
| tree | 8dc38626df3b6e1af73380dbd931d664c5c64fa7 /src | |
| parent | 49b84db584092f8a1fa9b63c801cf8cdc3bd89ff (diff) | |
| parent | af4466c7af7345a2a92f2523b29e79ce22205003 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I9404bf15dd2321957603feb1a605f7b50724cbe3
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions