diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-20 10:39:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-20 10:39:32 +0200 |
| commit | 0e3d54f8d7f9be26687afebcc9f456e4cefc2357 (patch) | |
| tree | f3826c927305cc137006aed968be6fbf57b42009 /src/extras/geometries/qconegeometry.cpp | |
| parent | 52121396c55e6100316f006c87b4fdaa8b5a0719 (diff) | |
| parent | 7e638edbd15640302516f9a69d20f62d26d4af06 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/render/framegraph/qrendersurfaceselector.cpp
src/render/frontend/qrendersettings.cpp
src/render/jobs/renderviewjobutils_p.h
tests/auto/render/render.pro
Change-Id: Ibe9eb962e3990e07f01a5608a2d60c79bc4c160f
Diffstat (limited to 'src/extras/geometries/qconegeometry.cpp')
0 files changed, 0 insertions, 0 deletions