diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:24:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:43:41 +0200 |
| commit | dc9e39eb679946e82bf3b1a82f5c49737f9994b2 (patch) | |
| tree | de7915ee5859149738a004134f2d146fae1c303f /src/svg/doc/src/qtsvg.qdoc | |
| parent | 9c8d5d82b6c222f8dbbe60ec0b9382bb75b52f42 (diff) | |
| parent | 0fcd0160662941a9ba800b36671e88d82790bd95 (diff) | |
| download | qtsvg-dc9e39eb679946e82bf3b1a82f5c49737f9994b2.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into devv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1ebd40264cf1afaf5bcbf8b2f272e153f51a5625
Diffstat (limited to 'src/svg/doc/src/qtsvg.qdoc')
0 files changed, 0 insertions, 0 deletions