diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-03-24 14:29:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-03-24 14:29:20 +0100 |
| commit | d09c937f3a390732cb96ff9764cc88c93921ae90 (patch) | |
| tree | c88ee493a37347410174115a6f92b723fe54f2ba | |
| parent | 33dd271aa4e97446b16000304e6014a855369359 (diff) | |
| parent | 0a889ff3ebc09ae9599f372f2cf4319049886e59 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
Change-Id: I9864a91c88b886ef47f1fc605cc8c74fb0138323
0 files changed, 0 insertions, 0 deletions