diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:33:42 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:33:42 +0100 |
| commit | b732824096cd3cf31f7a374aa3b92fa934ff9ecd (patch) | |
| tree | ac6d5c9ba469c66df65cfd25433d6c4017142284 /src | |
| parent | 58ee6c5866440b69f6a9d7a58f0fbeefbd578bc1 (diff) | |
| parent | 0f6f4d20f76eaf55eebfddfe49d9a6335f443d65 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I13eefcdefc2c2d754bce5f78cd24de307f728cb1
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions