diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-23 16:27:55 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-23 16:27:55 +0100 |
| commit | 193e53e544ebbb5ee60d4ad798648df345679e5a (patch) | |
| tree | 82f990b2650b8f3f069cdffe5efe66fbfd76fdd1 | |
| parent | e9967647ffe20df0473a1fa9eb10957b4e32fbf3 (diff) | |
| parent | 11c2589a51297324b6ed3320560c606bfbb051be (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: Ic7e6271274c0f60d3ec8a9caf3f054bec6544bf0
0 files changed, 0 insertions, 0 deletions