Conflicts: tests/auto/opengl/qgl/tst_qgl.cpp Change-Id: I3c601351c984c1f4b00478d3c47ac9eeb021e892 |
||
|---|---|---|
| .. | ||
| image | ||
| itemmodels | ||
| kernel | ||
| math3d | ||
| painting | ||
| qopengl | ||
| text | ||
| util | ||
| gui.pro | ||
Conflicts: tests/auto/opengl/qgl/tst_qgl.cpp Change-Id: I3c601351c984c1f4b00478d3c47ac9eeb021e892 |
||
|---|---|---|
| .. | ||
| image | ||
| itemmodels | ||
| kernel | ||
| math3d | ||
| painting | ||
| qopengl | ||
| text | ||
| util | ||
| gui.pro | ||