diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:40 +0200 |
| commit | 4b77b044b3e0a27f9f7501e6a78121afc270619c (patch) | |
| tree | e73fbe5865c60494f3b3f847b7385e76d05e3804 /src/extras | |
| parent | c24118685d6eb4cacf5f6af96215ba89ecc28604 (diff) | |
| parent | a2963fe162921c0abb2116aec6263204954030ad (diff) | |
| download | qtquickcontrols-4b77b044b3e0a27f9f7501e6a78121afc270619c.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
Diffstat (limited to 'src/extras')
| -rw-r--r-- | src/extras/doc/images/circulargauge.png | bin | 26247 -> 18984 bytes |
| -rw-r--r-- | src/extras/doc/images/delaybutton-activated.png | bin | 18460 -> 16620 bytes |
| -rw-r--r-- | src/extras/doc/images/delaybutton-progress.png | bin | 15558 -> 13870 bytes |
| -rw-r--r-- | src/extras/doc/images/delaybutton.png | bin | 8354 -> 4406 bytes |
| -rw-r--r-- | src/extras/doc/images/dial.png | bin | 14815 -> 8282 bytes |
| -rw-r--r-- | src/extras/doc/images/piemenu.png | bin | 17205 -> 13641 bytes |
| -rw-r--r-- | src/extras/doc/images/statusindicator-active.png | bin | 3434 -> 2678 bytes |
| -rw-r--r-- | src/extras/doc/images/statusindicator-green.png | bin | 3753 -> 2996 bytes |
| -rw-r--r-- | src/extras/doc/images/statusindicator-inactive.png | bin | 1702 -> 730 bytes |
| -rw-r--r-- | src/extras/doc/images/togglebutton-checked.png | bin | 11014 -> 9642 bytes |
| -rw-r--r-- | src/extras/doc/images/togglebutton-unchecked.png | bin | 10717 -> 9194 bytes |
11 files changed, 0 insertions, 0 deletions
diff --git a/src/extras/doc/images/circulargauge.png b/src/extras/doc/images/circulargauge.png Binary files differindex f88aa01f..b3957fe0 100644 --- a/src/extras/doc/images/circulargauge.png +++ b/src/extras/doc/images/circulargauge.png diff --git a/src/extras/doc/images/delaybutton-activated.png b/src/extras/doc/images/delaybutton-activated.png Binary files differindex d78d7738..ddb48ba0 100644 --- a/src/extras/doc/images/delaybutton-activated.png +++ b/src/extras/doc/images/delaybutton-activated.png diff --git a/src/extras/doc/images/delaybutton-progress.png b/src/extras/doc/images/delaybutton-progress.png Binary files differindex 07a13256..211af3df 100644 --- a/src/extras/doc/images/delaybutton-progress.png +++ b/src/extras/doc/images/delaybutton-progress.png diff --git a/src/extras/doc/images/delaybutton.png b/src/extras/doc/images/delaybutton.png Binary files differindex 510abc0b..39d243dc 100644 --- a/src/extras/doc/images/delaybutton.png +++ b/src/extras/doc/images/delaybutton.png diff --git a/src/extras/doc/images/dial.png b/src/extras/doc/images/dial.png Binary files differindex d0e4d5ac..248b60bc 100644 --- a/src/extras/doc/images/dial.png +++ b/src/extras/doc/images/dial.png diff --git a/src/extras/doc/images/piemenu.png b/src/extras/doc/images/piemenu.png Binary files differindex 95078eae..442e341c 100644 --- a/src/extras/doc/images/piemenu.png +++ b/src/extras/doc/images/piemenu.png diff --git a/src/extras/doc/images/statusindicator-active.png b/src/extras/doc/images/statusindicator-active.png Binary files differindex c5ebc09d..4bd7864f 100644 --- a/src/extras/doc/images/statusindicator-active.png +++ b/src/extras/doc/images/statusindicator-active.png diff --git a/src/extras/doc/images/statusindicator-green.png b/src/extras/doc/images/statusindicator-green.png Binary files differindex 88dcb1ed..a9fbceb8 100644 --- a/src/extras/doc/images/statusindicator-green.png +++ b/src/extras/doc/images/statusindicator-green.png diff --git a/src/extras/doc/images/statusindicator-inactive.png b/src/extras/doc/images/statusindicator-inactive.png Binary files differindex 27488d5e..e5205979 100644 --- a/src/extras/doc/images/statusindicator-inactive.png +++ b/src/extras/doc/images/statusindicator-inactive.png diff --git a/src/extras/doc/images/togglebutton-checked.png b/src/extras/doc/images/togglebutton-checked.png Binary files differindex d40b382b..0891d493 100644 --- a/src/extras/doc/images/togglebutton-checked.png +++ b/src/extras/doc/images/togglebutton-checked.png diff --git a/src/extras/doc/images/togglebutton-unchecked.png b/src/extras/doc/images/togglebutton-unchecked.png Binary files differindex 7db5b84b..ee27c038 100644 --- a/src/extras/doc/images/togglebutton-unchecked.png +++ b/src/extras/doc/images/togglebutton-unchecked.png |
