diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-07-11 12:45:26 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-07-11 12:45:26 +0000 |
commit | 82a5efc7c9862aab0962a59824568d3b6fe16f10 (patch) | |
tree | a67c52b981968c4e32627caea8546a7f63cb3a6f /examples | |
parent | a61bc1bd653559637146d9e0ba0884de3e3f1a12 (diff) | |
parent | 2dd6aa017685bd76f3a315871d07fdaef0e6d5f1 (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'examples')
21 files changed, 0 insertions, 0 deletions
diff --git a/examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png b/examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png Binary files differindex b0953dec5..b0953dec5 100755..100644 --- a/examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png +++ b/examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapcolortrans.png b/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapcolortrans.png Binary files differindex 1aabde94e..1aabde94e 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapcolortrans.png +++ b/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapcolortrans.png diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapspec.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapspec.jpg Binary files differindex 254b6fb6c..254b6fb6c 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapspec.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/earthcloudmapspec.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/earthmap2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/earthmap2k.jpg Binary files differindex e90540c83..e90540c83 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/earthmap2k.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/earthmap2k.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/earthnormal2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/earthnormal2k.jpg Binary files differindex 8215226fb..8215226fb 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/earthnormal2k.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/earthnormal2k.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/earthspec2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/earthspec2k.jpg Binary files differindex 8e2b3f6c1..8e2b3f6c1 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/earthspec2k.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/earthspec2k.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/galaxy_starfield.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/galaxy_starfield.jpg Binary files differindex 2be906a73..2be906a73 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/galaxy_starfield.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/galaxy_starfield.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/jupitermap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/jupitermap.jpg Binary files differindex f5af80197..f5af80197 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/jupitermap.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/jupitermap.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/marsmap2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/marsmap2k.jpg Binary files differindex ea77177fb..ea77177fb 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/marsmap2k.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/marsmap2k.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/marsnormal2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/marsnormal2k.jpg Binary files differindex 44a2e2f9b..44a2e2f9b 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/marsnormal2k.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/marsnormal2k.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg Binary files differindex f69e947c0..f69e947c0 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/mercurymap.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/mercurynormal.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/mercurynormal.jpg Binary files differindex 5e77923bf..5e77923bf 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/mercurynormal.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/mercurynormal.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg Binary files differindex 0e0c20d0a..0e0c20d0a 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/moonmap2k.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/moonnormal2k.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/moonnormal2k.jpg Binary files differindex 10797cf0a..10797cf0a 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/moonnormal2k.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/moonnormal2k.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/neptunemap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/neptunemap.jpg Binary files differindex 250fce966..250fce966 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/neptunemap.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/neptunemap.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/saturnmap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/saturnmap.jpg Binary files differindex 981bb36c9..981bb36c9 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/saturnmap.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/saturnmap.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/saturnringcolortrans.png b/examples/qt3d/planets-qml/images/solarsystemscope/saturnringcolortrans.png Binary files differindex aefd9f6c4..aefd9f6c4 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/saturnringcolortrans.png +++ b/examples/qt3d/planets-qml/images/solarsystemscope/saturnringcolortrans.png diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/sunmap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/sunmap.jpg Binary files differindex 46f2ce8c1..46f2ce8c1 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/sunmap.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/sunmap.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/uranusmap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/uranusmap.jpg Binary files differindex 96cea14be..96cea14be 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/uranusmap.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/uranusmap.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/venusmap.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/venusmap.jpg Binary files differindex 93bed3e47..93bed3e47 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/venusmap.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/venusmap.jpg diff --git a/examples/qt3d/planets-qml/images/solarsystemscope/venusnormal.jpg b/examples/qt3d/planets-qml/images/solarsystemscope/venusnormal.jpg Binary files differindex 0fc5ff703..0fc5ff703 100755..100644 --- a/examples/qt3d/planets-qml/images/solarsystemscope/venusnormal.jpg +++ b/examples/qt3d/planets-qml/images/solarsystemscope/venusnormal.jpg |