diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:02:59 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:03:44 +0100 |
| commit | f71a6d1a746d5ceb19ce017902c83e1819b5c0ea (patch) | |
| tree | fb23afdccd8fd566d973ff3b3f95f30e8b24845e | |
| parent | c043ebebaba80b32ddb69ed29aa3408549567a6d (diff) | |
| parent | 0d6105563d5e53356dfdae64bcb19a1e8e4db6b8 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
Change-Id: I1d5aeef667b2207ef0d0eb09f8ae17f6eadd77f9
0 files changed, 0 insertions, 0 deletions