diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:33:41 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:33:41 +0100 |
| commit | 3ef91292426c4aa56989e843e1c675a7ba6ac1c9 (patch) | |
| tree | ed32608cc2d6d38043f4004d06d061d2c6d28dba | |
| parent | 0ca136b49b86f90e7f691d9ad067949e826c0166 (diff) | |
| parent | ae27a573d67e1a7c6041b497592174b306bea6e9 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ie865e075fa077e2dfa956ea4859943389c717fb4
0 files changed, 0 insertions, 0 deletions