diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:31:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:31:35 +0100 |
| commit | 80d7f92b9628076b681e509ddf8eae43cac550d5 (patch) | |
| tree | dda154244ebe2b10403e5929611e48ac82daeb51 | |
| parent | ab0897320e59e5a4ddd2d667d02f3e54130b5c7d (diff) | |
| parent | 08b2b0033d734710ced9050e71a79e094257462a (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: I153cc6e975c63e72fc2205c9b960d79f11eaff55
0 files changed, 0 insertions, 0 deletions