diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:31:03 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:31:03 +0100 |
| commit | e4b624f9af5eab253c75a8800e497662b57648c7 (patch) | |
| tree | b3f4b45b80b7c0251032fcbaa7c988e9bc14adab | |
| parent | 3c07a8fc659400470ac378cdb9756f0b09138127 (diff) | |
| parent | 69d6f65ed454aba274af2d7cd4e0e264888afa40 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I32b1793dc57654853d458fe42e92c4c74761ccd3
0 files changed, 0 insertions, 0 deletions