diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 11:16:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-08 11:16:24 +0000 |
| commit | dab3fa107fa7b4a82928b71748b857ff85180f1e (patch) | |
| tree | 9a1e85401ae6b790209f666441f121bb13d1a7f8 /examples/qml | |
| parent | a889bcb6c3c66a616e73fa5ed3c9d900d7c7d6f5 (diff) | |
| parent | 68ba8fe3ccf7abe8d24ba3614f8d7ceb3778de74 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'examples/qml')
| -rw-r--r-- | examples/qml/dynamicscene/content/images/star.png | bin | 349 -> 259 bytes |
| -rw-r--r-- | examples/qml/dynamicscene/content/images/sun.png | bin | 8153 -> 8110 bytes |
| -rw-r--r-- | examples/qml/qmlextensionplugins/imports/TimeExample/hour.png | bin | 625 -> 518 bytes |
| -rw-r--r-- | examples/qml/qmlextensionplugins/imports/TimeExample/minute.png | bin | 625 -> 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 Binary files differindex 27ef924267..bdcd36909d 100644 --- a/examples/qml/dynamicscene/content/images/star.png +++ b/examples/qml/dynamicscene/content/images/star.png diff --git a/examples/qml/dynamicscene/content/images/sun.png b/examples/qml/dynamicscene/content/images/sun.png Binary files differindex 7713ca5ce7..c5fd36ed39 100644 --- a/examples/qml/dynamicscene/content/images/sun.png +++ b/examples/qml/dynamicscene/content/images/sun.png diff --git a/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png b/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png Binary files differindex f8061a1235..9f33fc5d48 100644 --- a/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png +++ b/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png diff --git a/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png b/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png Binary files differindex 1297ec7c2b..e2f216c897 100644 --- a/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png +++ b/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png |
