diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:31:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:31:20 +0100 |
| commit | de7d5543ae093b84a6526cad0d8c56fc12f7526f (patch) | |
| tree | 7372ac716ae527bd0da96d8b1e0cd4b4b99fb41a /src | |
| parent | 73d797cda0579f18ef4ef837a6384315619b50be (diff) | |
| parent | d20e0613191fe8678712af45b18130b58b3db5a2 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I71eb3076d643358befc6314f051f7455bcc41f68
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions