diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:36:16 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-05 13:36:17 +0100 |
| commit | 07e06c4bbff848b1caf044e9056936c54cd29f4d (patch) | |
| tree | 99d22acb9c4924fa6cd7e3bad23aed4273321445 /examples/svg/embedded/weatherinfo | |
| parent | 84bc219fb1e9f586c1f7ac2c10172c4da2605f96 (diff) | |
| parent | d072a505d7ff39d509b9c9e2de8722cd3549b4df (diff) | |
| download | qtsvg-54250f68d8c45114888d8426468bb9b8ef527fb3.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ia45146f4dce4df2a0bc9af4365be3832451a79a9
Diffstat (limited to 'examples/svg/embedded/weatherinfo')
0 files changed, 0 insertions, 0 deletions