diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 12:33:10 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 12:33:10 +0200 |
| commit | 665fd2e47bed500ee5395ea5b9a6c57b4940ceed (patch) | |
| tree | 45b80cc0210540aa4e7c69a4da45911b317be231 /src/imports/rasterrenderer/batchrenderer.cpp | |
| parent | 03b666a967fb7501248e9f40a5b187ec3a16c453 (diff) | |
| parent | b6b7fa3596d1957237d327a37941c6eb3ff8d6b3 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2v5.14.0-beta1
Conflicts:
.qmake.conf
Change-Id: Ide3a207fa33936e215819eb49601e764115a17c4
Diffstat (limited to 'src/imports/rasterrenderer/batchrenderer.cpp')
0 files changed, 0 insertions, 0 deletions