summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:21 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2016-04-08 10:23:21 +0200
commitd32aff3e0453475c1a22d5e8c7a106df18c0ad10 (patch)
treee547f0d8b6174e227add827a9143f5f7ef1d2fe3 /examples
parentb26003419f054722c16cfc9bc3b4366261543bff (diff)
parentc8eed01f1ffe5ad03a82d0bb7c49b71d5cec09b3 (diff)
downloadqtmultimedia-d32aff3e0453475c1a22d5e8c7a106df18c0ad10.tar.gz
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7
Diffstat (limited to 'examples')
-rw-r--r--examples/multimedia/audiooutput/doc/images/audiooutput-example.pngbin11966 -> 9249 bytes
-rw-r--r--examples/multimedia/declarative-radio/doc/images/declarative-radio-example.pngbin12113 -> 9809 bytes
-rw-r--r--examples/multimedia/spectrum/app/images/record.pngbin670 -> 466 bytes
-rw-r--r--examples/multimedia/spectrum/doc/images/spectrum-demo.pngbin10500 -> 8691 bytes
-rw-r--r--examples/multimedia/video/qmlvideofx/images/qt-logo.pngbin13923 -> 9186 bytes
5 files changed, 0 insertions, 0 deletions
diff --git a/examples/multimedia/audiooutput/doc/images/audiooutput-example.png b/examples/multimedia/audiooutput/doc/images/audiooutput-example.png
index 5588fbb57..1abf5571f 100644
--- a/examples/multimedia/audiooutput/doc/images/audiooutput-example.png
+++ b/examples/multimedia/audiooutput/doc/images/audiooutput-example.png
Binary files differ
diff --git a/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png b/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png
index 5b29174c5..882180b21 100644
--- a/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png
+++ b/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png
Binary files differ
diff --git a/examples/multimedia/spectrum/app/images/record.png b/examples/multimedia/spectrum/app/images/record.png
index e7493aad9..184fce809 100644
--- a/examples/multimedia/spectrum/app/images/record.png
+++ b/examples/multimedia/spectrum/app/images/record.png
Binary files differ
diff --git a/examples/multimedia/spectrum/doc/images/spectrum-demo.png b/examples/multimedia/spectrum/doc/images/spectrum-demo.png
index 9ccb489a9..077cbb68d 100644
--- a/examples/multimedia/spectrum/doc/images/spectrum-demo.png
+++ b/examples/multimedia/spectrum/doc/images/spectrum-demo.png
Binary files differ
diff --git a/examples/multimedia/video/qmlvideofx/images/qt-logo.png b/examples/multimedia/video/qmlvideofx/images/qt-logo.png
index 7d3e97eb3..ecbff0ca3 100644
--- a/examples/multimedia/video/qmlvideofx/images/qt-logo.png
+++ b/examples/multimedia/video/qmlvideofx/images/qt-logo.png
Binary files differ