diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:22:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:22:47 +0200 |
| commit | 32404e27101c5ec81b4ab965faf38263429bbc5a (patch) | |
| tree | 9f7a7af74af39ec2e26b7f42bb8136243fa30851 | |
| parent | 4f4eda51954b7983016e6a062d3db77a68c2ad67 (diff) | |
| parent | 791ddce7d41b126ba4744a6701597f49dbf99f3b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I30b435f828cc2a0381e8ed34baacf4ecca545e6e
| -rw-r--r-- | examples/canvas3d/canvas3d/threejs/planets/images/galaxy_starfield.png | bin | 673311 -> 670297 bytes |
| -rw-r--r-- | tests/auto/qmltest/canvas3d/tst_render_checkresult.png | bin | 155 -> 85 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/examples/canvas3d/canvas3d/threejs/planets/images/galaxy_starfield.png b/examples/canvas3d/canvas3d/threejs/planets/images/galaxy_starfield.png Binary files differindex 67d808a..36a762e 100644 --- a/examples/canvas3d/canvas3d/threejs/planets/images/galaxy_starfield.png +++ b/examples/canvas3d/canvas3d/threejs/planets/images/galaxy_starfield.png diff --git a/tests/auto/qmltest/canvas3d/tst_render_checkresult.png b/tests/auto/qmltest/canvas3d/tst_render_checkresult.png Binary files differindex df71b45..031dcb2 100644 --- a/tests/auto/qmltest/canvas3d/tst_render_checkresult.png +++ b/tests/auto/qmltest/canvas3d/tst_render_checkresult.png |
