aboutsummaryrefslogtreecommitdiffstats
path: root/examples/qml
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 23:42:37 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 23:42:37 +0200
commitb9eca979f8557aa1d7f3cb1af01284720d23a425 (patch)
tree7bbc1cc7b17a6c65e43352dd55bfa77f5b2d5c39 /examples/qml
parent1148d3acead3c13072876b873fb4ee9440921943 (diff)
parentdab3fa107fa7b4a82928b71748b857ff85180f1e (diff)
Merge remote-tracking branch 'origin/5.7' into dev
Diffstat (limited to 'examples/qml')
-rw-r--r--examples/qml/dynamicscene/content/images/star.pngbin349 -> 259 bytes
-rw-r--r--examples/qml/dynamicscene/content/images/sun.pngbin8153 -> 8110 bytes
-rw-r--r--examples/qml/qmlextensionplugins/imports/TimeExample/hour.pngbin625 -> 518 bytes
-rw-r--r--examples/qml/qmlextensionplugins/imports/TimeExample/minute.pngbin625 -> 528 bytes
4 files changed, 0 insertions, 0 deletions
diff --git a/examples/qml/dynamicscene/content/images/star.png b/examples/qml/dynamicscene/content/images/star.png
index 27ef924267..bdcd36909d 100644
--- a/examples/qml/dynamicscene/content/images/star.png
+++ b/examples/qml/dynamicscene/content/images/star.png
Binary files differ
diff --git a/examples/qml/dynamicscene/content/images/sun.png b/examples/qml/dynamicscene/content/images/sun.png
index 7713ca5ce7..c5fd36ed39 100644
--- a/examples/qml/dynamicscene/content/images/sun.png
+++ b/examples/qml/dynamicscene/content/images/sun.png
Binary files differ
diff --git a/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png b/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png
index f8061a1235..9f33fc5d48 100644
--- a/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png
+++ b/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png
Binary files differ
diff --git a/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png b/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png
index 1297ec7c2b..e2f216c897 100644
--- a/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png
+++ b/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png
Binary files differ