diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:32:55 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:32:56 +0100 |
| commit | 649afa13b841cdf8339cfb605ef2ecba81768846 (patch) | |
| tree | c4f24eafe0dfaede476ae24fee70565a9c84a418 | |
| parent | e30d6817586248f1e25ea29faf5884e44d354497 (diff) | |
| parent | 7f05ba0039134598dffa17c2ef3e234b5e27241a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I79c0880ed27f48d7b4fbb87efd17a5efa1387489
0 files changed, 0 insertions, 0 deletions