diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-28 13:04:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-28 13:04:10 +0100 |
| commit | 5adf257bebf2df7f54b92fb724cd547dc58a1163 (patch) | |
| tree | 5fcf162817cc87b712b935947debf964c3943cf6 /.qmake.conf | |
| parent | 01347e7ee885166177990f2314f0e9edc94fd961 (diff) | |
| parent | 743f32ee776220b52e0c37cbbbff5b4c52c475b6 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I4a90e10341cff0615150101501a086aa3b0d847a
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions