diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:37:51 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:38:33 +0100 |
| commit | 313f221381507eee36c8e3bd0069b3e7962da140 (patch) | |
| tree | 9436ff9c56283c29d52c950cb12783a04e00ea1b | |
| parent | 9152a285cdb072bc622e693f1a74f2ee3eda5503 (diff) | |
| parent | da6d567a54292f2c6c2f43af647b576be8c9a8f0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta4v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: Ibf90b43225de08ea50ab255b1ae877e4f8072b05
0 files changed, 0 insertions, 0 deletions