diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:21:01 +0200 |
| commit | 6ecc60c5ae78f301794ce9b0c4ceee6da730fba2 (patch) | |
| tree | d3569d27263a6bd7c978238990fbf49c3e77f8e8 /src | |
| parent | 7c7915a2e750327a862e1117b05b9ad40955644d (diff) | |
| parent | 0e2e43c94b415803600041a72ca56736c10a4cfa (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I2620ebe62524c41b71c607347391e33a217ad88a
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions