diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:30:06 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:30:06 +0100 |
| commit | 6e1be78c12be9857c6c35bdd6e89331e41708b22 (patch) | |
| tree | 780b0146716414bc061ace78ba6f3c91751d724c | |
| parent | 9c0e794c4dd14df02696482d6818558dd70815a3 (diff) | |
| parent | 2c681d20c0afd203876bfd733b559eb021aa7cdf (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-rc2v5.14.0-rc1v5.14.0-beta3v5.14.0
Conflicts:
.qmake.conf
Change-Id: I57c453a4f844e7e47f06bb6e2f13498e2989972b
0 files changed, 0 insertions, 0 deletions