diff options
author | Robert Brock <robert.brock@kdab.com> | 2017-01-09 08:10:57 +0000 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-16 10:02:58 +0000 |
commit | 4b3f368aba47d559040c3f038620883462b925ea (patch) | |
tree | 1829f28a84bddde1b0b3469d1d2a91c368d7ec0e /examples/qt3d/planets-qml/images/nasa | |
parent | 7261606116768d563c0e49a23ca60ab367a4cab5 (diff) |
Replace undistributable files
The texture files used were from a third party that didn't explicitly
allow their distribution. All of them have been replaced by textures
from NASA and another third party that do allow their distribution
and editing.
Task-number: QTBUG-57543
Change-Id: I69f1309424bba029cdce08689ea8670ed32d44ae
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples/qt3d/planets-qml/images/nasa')
-rw-r--r-- | examples/qt3d/planets-qml/images/nasa/license.txt | 3 | ||||
-rw-r--r-- | examples/qt3d/planets-qml/images/nasa/qt_attribution.json | 13 | ||||
-rwxr-xr-x | examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png | bin | 0 -> 341169 bytes |
3 files changed, 16 insertions, 0 deletions
diff --git a/examples/qt3d/planets-qml/images/nasa/license.txt b/examples/qt3d/planets-qml/images/nasa/license.txt new file mode 100644 index 000000000..62a6d9ffd --- /dev/null +++ b/examples/qt3d/planets-qml/images/nasa/license.txt @@ -0,0 +1,3 @@ +Uranus Ring: +http://photojournal.jpl.nasa.gov/catalog/PIA00033 - Courtesy NASA/JPL-Caltech. +Used under the terms of the license at http://www.jpl.nasa.gov/imagepolicy/ diff --git a/examples/qt3d/planets-qml/images/nasa/qt_attribution.json b/examples/qt3d/planets-qml/images/nasa/qt_attribution.json new file mode 100644 index 000000000..174e092ef --- /dev/null +++ b/examples/qt3d/planets-qml/images/nasa/qt_attribution.json @@ -0,0 +1,13 @@ +{ + "Id": "nasa-jpl", + "Name": "Jet Propulsion Laboratory Photojournal", + "QDocModule": "qt3d", + "Description": "The NASA/JPL Photojournal provides high quality images related to space research and exploration", + "QtUsage": "Used in Qt 3D planets-qml example.", + + "DownloadLocation": "https://photojournal.jpl.nasa.gov/catalog/PIA00033", + "Homepage": "https://photojournal.jpl.nasa.gov/", + "License": "JPL Image Use Policy", + "LicenseFile": "license.txt", + "Copyright": "Copyright (c) 1996, Jet Propulsion Laboratory" +} diff --git a/examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png b/examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png Binary files differnew file mode 100755 index 000000000..b0953dec5 --- /dev/null +++ b/examples/qt3d/planets-qml/images/nasa/uranusringcolortrans.png |