diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:02:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 21:38:02 +0100 |
| commit | c26dd694e8374b478bf428bc9e8753cfc0c3a523 (patch) | |
| tree | 5b74584f0e738f4ebcf8e6c9e49d5d6834a21712 | |
| parent | b43f3e19e6fa9e6fe551afdc1b20e4d61acc9162 (diff) | |
| parent | 286f3c626087635cb24708b8e42b1d8af0401640 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: Id9b872ae916efdbbb46c166cf741f73867795bcc
0 files changed, 0 insertions, 0 deletions