diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:27 +0200 |
| commit | 6d019d276a4be4e1a20eaf41a16eca64007249f3 (patch) | |
| tree | e85a4b5eecf47a3b4dfa0f8353af2ed84120f1d0 /examples | |
| parent | dcb06c7880b89530f3fbbb6bbe519d203dce517d (diff) | |
| parent | e7d198e87396eb160fa9b1163eb73af152e70da2 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I0ce2094980fbd70c017fea7748cbc5c224d974cc
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-non-composited.png | bin | 59305 -> 45021 bytes |
| -rw-r--r-- | examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-taskbar.png | bin | 12622 -> 10067 bytes |
| -rw-r--r-- | examples/winextras/musicplayer/images/musicplayer.png | bin | 13923 -> 9186 bytes |
| -rw-r--r-- | examples/winextras/quickplayer/images/media-pause-16.png | bin | 229 -> 142 bytes |
| -rw-r--r-- | examples/winextras/quickplayer/images/media-seek-backward-32.png | bin | 548 -> 387 bytes |
| -rw-r--r-- | examples/winextras/quickplayer/images/media-seek-forward-32.png | bin | 524 -> 363 bytes |
| -rw-r--r-- | examples/winextras/quickplayer/images/quickplayer.png | bin | 13923 -> 9186 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-non-composited.png b/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-non-composited.png Binary files differindex 682449b..e0a6afe 100644 --- a/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-non-composited.png +++ b/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-non-composited.png diff --git a/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-taskbar.png b/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-taskbar.png Binary files differindex b03d192..8742da2 100644 --- a/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-taskbar.png +++ b/examples/winextras/musicplayer/doc/images/qtwinextras-musicplayer-taskbar.png diff --git a/examples/winextras/musicplayer/images/musicplayer.png b/examples/winextras/musicplayer/images/musicplayer.png Binary files differindex 7d3e97e..ecbff0c 100644 --- a/examples/winextras/musicplayer/images/musicplayer.png +++ b/examples/winextras/musicplayer/images/musicplayer.png diff --git a/examples/winextras/quickplayer/images/media-pause-16.png b/examples/winextras/quickplayer/images/media-pause-16.png Binary files differindex 6cb1fd7..8d06287 100644 --- a/examples/winextras/quickplayer/images/media-pause-16.png +++ b/examples/winextras/quickplayer/images/media-pause-16.png diff --git a/examples/winextras/quickplayer/images/media-seek-backward-32.png b/examples/winextras/quickplayer/images/media-seek-backward-32.png Binary files differindex a21d137..c14112e 100644 --- a/examples/winextras/quickplayer/images/media-seek-backward-32.png +++ b/examples/winextras/quickplayer/images/media-seek-backward-32.png diff --git a/examples/winextras/quickplayer/images/media-seek-forward-32.png b/examples/winextras/quickplayer/images/media-seek-forward-32.png Binary files differindex 4f8d370..00c0747 100644 --- a/examples/winextras/quickplayer/images/media-seek-forward-32.png +++ b/examples/winextras/quickplayer/images/media-seek-forward-32.png diff --git a/examples/winextras/quickplayer/images/quickplayer.png b/examples/winextras/quickplayer/images/quickplayer.png Binary files differindex 7d3e97e..ecbff0c 100644 --- a/examples/winextras/quickplayer/images/quickplayer.png +++ b/examples/winextras/quickplayer/images/quickplayer.png |
