diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:35:39 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:35:39 +0100 |
| commit | f5cc3184f30c9fa1b81d931430aaa4f6f23267a3 (patch) | |
| tree | f890b7f990f3c1bc69396d82bb8257aa9efd9fe0 | |
| parent | e14d6cd4de7e2692da95511e8a2dc53fa30d1cc2 (diff) | |
| parent | 798be5abdb7d6e73288780c9ee03c10550dde07d (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: Ic7023fc60c03fa0f6d87a964c2a3aa2781924c5e
0 files changed, 0 insertions, 0 deletions