diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:22:32 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 10:22:32 +0100 |
| commit | d7f1d23c1dd954d20e8358ca6b7c3f6720310f50 (patch) | |
| tree | c531adf1f61cba80c35ba0601e91ed3fc41c7b84 | |
| parent | 993ab0bd1d573f0bbab6e3fcd08d25bc4f32a3d9 (diff) | |
| parent | 04c42632315ee4e9ac22003b572d4877fcbd33f9 (diff) | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I2ded181b4cea9cfb2d641ef1ef5264a3b9084fe0
0 files changed, 0 insertions, 0 deletions