diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-23 16:26:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-23 16:26:54 +0100 |
| commit | 8f931f2d48ad6e4b1518142036d7631162f57915 (patch) | |
| tree | 623fd8689fcfdc01a62c3d342aede2a944d21342 | |
| parent | 22afd6cf09e235f926980d325ca467766d078283 (diff) | |
| parent | 92f9b785a97de43f53b8d521034877a3203384fa (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: I528aa22d5604aa3ba97f11dc69fa0025966ed0ef
0 files changed, 0 insertions, 0 deletions