diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:37:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:37:15 +0100 |
| commit | 8c2a9138ffb00fdab49ab3ef128e4b1c92eb880c (patch) | |
| tree | b72d66552cb829974999f346f56c24f7c8648cb9 | |
| parent | 2eb972216c649296f8e0afbc055e94f8240ad770 (diff) | |
| parent | ab6f188bf00a9572804baa7b788536247ce88626 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ica2020409c12e3ed47bd1af0c9221b5af6c15559
0 files changed, 0 insertions, 0 deletions