diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:31:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:32:39 +0100 |
| commit | 7bcc5dc2c323b2ed120fb7bf695286f6a01c44d0 (patch) | |
| tree | e8b6498d72faeb60e04246a7d1646efe0317151d /src | |
| parent | b295f466b8a9cfc756ed22794e3b35ab20e20dbb (diff) | |
| parent | a7be018dfae73e4e2a68fd82e775d05d52aea983 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
Change-Id: I5dcafa278c0c51bc3d540ab46320e5a21ef51115
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions