diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:21 +0200 |
| commit | d32aff3e0453475c1a22d5e8c7a106df18c0ad10 (patch) | |
| tree | e547f0d8b6174e227add827a9143f5f7ef1d2fe3 /examples/multimedia | |
| parent | b26003419f054722c16cfc9bc3b4366261543bff (diff) | |
| parent | c8eed01f1ffe5ad03a82d0bb7c49b71d5cec09b3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7
Diffstat (limited to 'examples/multimedia')
| -rw-r--r-- | examples/multimedia/audiooutput/doc/images/audiooutput-example.png | bin | 11966 -> 9249 bytes |
| -rw-r--r-- | examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png | bin | 12113 -> 9809 bytes |
| -rw-r--r-- | examples/multimedia/spectrum/app/images/record.png | bin | 670 -> 466 bytes |
| -rw-r--r-- | examples/multimedia/spectrum/doc/images/spectrum-demo.png | bin | 10500 -> 8691 bytes |
| -rw-r--r-- | examples/multimedia/video/qmlvideofx/images/qt-logo.png | bin | 13923 -> 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 Binary files differindex 5588fbb57..1abf5571f 100644 --- a/examples/multimedia/audiooutput/doc/images/audiooutput-example.png +++ b/examples/multimedia/audiooutput/doc/images/audiooutput-example.png diff --git a/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png b/examples/multimedia/declarative-radio/doc/images/declarative-radio-example.png Binary files differindex 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 diff --git a/examples/multimedia/spectrum/app/images/record.png b/examples/multimedia/spectrum/app/images/record.png Binary files differindex e7493aad9..184fce809 100644 --- a/examples/multimedia/spectrum/app/images/record.png +++ b/examples/multimedia/spectrum/app/images/record.png diff --git a/examples/multimedia/spectrum/doc/images/spectrum-demo.png b/examples/multimedia/spectrum/doc/images/spectrum-demo.png Binary files differindex 9ccb489a9..077cbb68d 100644 --- a/examples/multimedia/spectrum/doc/images/spectrum-demo.png +++ b/examples/multimedia/spectrum/doc/images/spectrum-demo.png diff --git a/examples/multimedia/video/qmlvideofx/images/qt-logo.png b/examples/multimedia/video/qmlvideofx/images/qt-logo.png Binary files differindex 7d3e97eb3..ecbff0ca3 100644 --- a/examples/multimedia/video/qmlvideofx/images/qt-logo.png +++ b/examples/multimedia/video/qmlvideofx/images/qt-logo.png |
