diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:33:33 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:33:33 +0100 |
| commit | bae669b37d3828eb73e78e7c77f0a5fccf8e3150 (patch) | |
| tree | 7c081dabdb119b6f285cbfd943a572d8434714e6 | |
| parent | bbd79d8584b1321c9091a13a15793db12a19b561 (diff) | |
| parent | 2ac294443a72799c021dcf3513c83fb628f3c193 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I413d6fb9aeabc1ae327ed58b74172df00dfa8d61
0 files changed, 0 insertions, 0 deletions