diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-18 09:23:12 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-18 09:23:12 +0100 |
| commit | 8d3da74a5828b4c09847342bc45855d0889ede7d (patch) | |
| tree | fe6508caab4d258a0264df228fbc825266e1d6a9 /tests | |
| parent | 82379a1de608f696c28429a8f7a901b9996d6eff (diff) | |
| parent | ef3d6d957a01c836370c83fdfd64b7e54f4a6c5e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I0a9f54a83bb4c76a25a45cbd04214b26976600bd
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions