diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:03:33 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-18 18:19:09 +0100 |
| commit | 275bd8a4a76256e889cad1ea88c4b5d3acb9ad8f (patch) | |
| tree | 7b6db0f30a20657fe12d140b64c3a106c6d184b2 /src | |
| parent | b9cddbd84b74fdda30190800ed827dc80aa65f6c (diff) | |
| parent | 74eb2d7d0268492c95779cb6029393aa1de67e05 (diff) | |
| download | qtsvg-275bd8a4a76256e889cad1ea88c4b5d3acb9ad8f.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: I5a4e51446414fc6447f478d8c3d8da2a071fb965
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions