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 /src/multimedia/doc | |
| parent | b26003419f054722c16cfc9bc3b4366261543bff (diff) | |
| parent | c8eed01f1ffe5ad03a82d0bb7c49b71d5cec09b3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I7de78c63b5f81620474c69e5c651202c553a70d7
Diffstat (limited to 'src/multimedia/doc')
| -rw-r--r-- | src/multimedia/doc/src/images/annotatedurl.png | bin | 40129 -> 34705 bytes |
| -rw-r--r-- | src/multimedia/doc/src/images/video-graphics-memory.png | bin | 14934 -> 12945 bytes |
| -rw-r--r-- | src/multimedia/doc/src/images/video-qml-paint-rate.png | bin | 6350 -> 6121 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/src/multimedia/doc/src/images/annotatedurl.png b/src/multimedia/doc/src/images/annotatedurl.png Binary files differindex 38d86fb49..b6cf8637c 100644 --- a/src/multimedia/doc/src/images/annotatedurl.png +++ b/src/multimedia/doc/src/images/annotatedurl.png diff --git a/src/multimedia/doc/src/images/video-graphics-memory.png b/src/multimedia/doc/src/images/video-graphics-memory.png Binary files differindex 9479cce4c..4bea33322 100644 --- a/src/multimedia/doc/src/images/video-graphics-memory.png +++ b/src/multimedia/doc/src/images/video-graphics-memory.png diff --git a/src/multimedia/doc/src/images/video-qml-paint-rate.png b/src/multimedia/doc/src/images/video-qml-paint-rate.png Binary files differindex 1519ff64e..cb7d822d9 100644 --- a/src/multimedia/doc/src/images/video-qml-paint-rate.png +++ b/src/multimedia/doc/src/images/video-qml-paint-rate.png |
