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/controls/doc | |
| 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/controls/doc')
| -rw-r--r-- | src/controls/doc/images/applicationwindow.png | bin | 4576 -> 3390 bytes |
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png | bin | 11536 -> 11465 bytes |
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-basiclayouts.png | bin | 24795 -> 24761 bytes |
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-text.png | bin | 76249 -> 76178 bytes |
| -rw-r--r-- | src/controls/doc/images/qtquickcontrols-example-touch.png | bin | 14347 -> 14276 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/src/controls/doc/images/applicationwindow.png b/src/controls/doc/images/applicationwindow.png Binary files differindex 90111f72..478cdda5 100644 --- a/src/controls/doc/images/applicationwindow.png +++ b/src/controls/doc/images/applicationwindow.png diff --git a/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png b/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png Binary files differindex b8e1faab..0c54d62b 100644 --- a/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png +++ b/src/controls/doc/images/qtquickcontrols-example-applicationtemplate.png diff --git a/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png b/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png Binary files differindex 94619bae..cfea7771 100644 --- a/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png +++ b/src/controls/doc/images/qtquickcontrols-example-basiclayouts.png diff --git a/src/controls/doc/images/qtquickcontrols-example-text.png b/src/controls/doc/images/qtquickcontrols-example-text.png Binary files differindex 36aab4d5..94813412 100644 --- a/src/controls/doc/images/qtquickcontrols-example-text.png +++ b/src/controls/doc/images/qtquickcontrols-example-text.png diff --git a/src/controls/doc/images/qtquickcontrols-example-touch.png b/src/controls/doc/images/qtquickcontrols-example-touch.png Binary files differindex e33455bc..d4f26589 100644 --- a/src/controls/doc/images/qtquickcontrols-example-touch.png +++ b/src/controls/doc/images/qtquickcontrols-example-touch.png |
