diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:31:11 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:31:11 +0100 |
| commit | 9f58d3afbf3157bf9dcf3614a530fb8e179f60b9 (patch) | |
| tree | bf2db7d3206e85ca25ca3af112e983798bb855da | |
| parent | c79211e618a015f7e33fca5f0a3e15b352bed876 (diff) | |
| parent | 8245e27d9b5e395ddfeebda39cef2b5e1b8c8d51 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ibf12c6680efff9c49275ac912ad7a1597bd87bc3
0 files changed, 0 insertions, 0 deletions