diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-10 21:11:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-10 21:11:23 +0200 |
| commit | c6713e212ef0b97c45d6466b73220567e94a05f1 (patch) | |
| tree | 8774d26bf05f2087c510d16da42bfd0dc59a54b1 /examples/quickcontrols/extras/flat/images | |
| parent | ce97d9c8ef4e6f8cb2166065b6732cad3cccf604 (diff) | |
| parent | 0e00f9fa1cbdbdd2128f2ca31172d88f701ecb59 (diff) | |
| download | qtquickcontrols-c6713e212ef0b97c45d6466b73220567e94a05f1.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/quickcontrols/extras/flat/main.cpp
src/controls/Private/qquickcontrolsettings.cpp
Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
Diffstat (limited to 'examples/quickcontrols/extras/flat/images')
| -rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-bw-normal.png | bin | 0 -> 1716 bytes |
| -rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-bw-pressed.png | bin | 0 -> 1394 bytes |
| -rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-image-bw.jpg | bin | 0 -> 1065560 bytes |
| -rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-image-rgb.jpg | bin | 0 -> 1152261 bytes |
| -rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-image-sepia.jpg | bin | 0 -> 1513238 bytes |
| -rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-rgb-normal.png | bin | 0 -> 1665 bytes |
| -rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-rgb-pressed.png | bin | 0 -> 1571 bytes |
| -rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-sepia-normal.png | bin | 0 -> 1410 bytes |
| -rw-r--r-- | examples/quickcontrols/extras/flat/images/piemenu-sepia-pressed.png | bin | 0 -> 1386 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/examples/quickcontrols/extras/flat/images/piemenu-bw-normal.png b/examples/quickcontrols/extras/flat/images/piemenu-bw-normal.png Binary files differnew file mode 100644 index 00000000..ef57111f --- /dev/null +++ b/examples/quickcontrols/extras/flat/images/piemenu-bw-normal.png diff --git a/examples/quickcontrols/extras/flat/images/piemenu-bw-pressed.png b/examples/quickcontrols/extras/flat/images/piemenu-bw-pressed.png Binary files differnew file mode 100644 index 00000000..b6bd1d20 --- /dev/null +++ b/examples/quickcontrols/extras/flat/images/piemenu-bw-pressed.png diff --git a/examples/quickcontrols/extras/flat/images/piemenu-image-bw.jpg b/examples/quickcontrols/extras/flat/images/piemenu-image-bw.jpg Binary files differnew file mode 100644 index 00000000..ce4d8ffd --- /dev/null +++ b/examples/quickcontrols/extras/flat/images/piemenu-image-bw.jpg diff --git a/examples/quickcontrols/extras/flat/images/piemenu-image-rgb.jpg b/examples/quickcontrols/extras/flat/images/piemenu-image-rgb.jpg Binary files differnew file mode 100644 index 00000000..2d7d2205 --- /dev/null +++ b/examples/quickcontrols/extras/flat/images/piemenu-image-rgb.jpg diff --git a/examples/quickcontrols/extras/flat/images/piemenu-image-sepia.jpg b/examples/quickcontrols/extras/flat/images/piemenu-image-sepia.jpg Binary files differnew file mode 100644 index 00000000..3ef7b1f0 --- /dev/null +++ b/examples/quickcontrols/extras/flat/images/piemenu-image-sepia.jpg diff --git a/examples/quickcontrols/extras/flat/images/piemenu-rgb-normal.png b/examples/quickcontrols/extras/flat/images/piemenu-rgb-normal.png Binary files differnew file mode 100644 index 00000000..2278f4a9 --- /dev/null +++ b/examples/quickcontrols/extras/flat/images/piemenu-rgb-normal.png diff --git a/examples/quickcontrols/extras/flat/images/piemenu-rgb-pressed.png b/examples/quickcontrols/extras/flat/images/piemenu-rgb-pressed.png Binary files differnew file mode 100644 index 00000000..f45846b1 --- /dev/null +++ b/examples/quickcontrols/extras/flat/images/piemenu-rgb-pressed.png diff --git a/examples/quickcontrols/extras/flat/images/piemenu-sepia-normal.png b/examples/quickcontrols/extras/flat/images/piemenu-sepia-normal.png Binary files differnew file mode 100644 index 00000000..f1e9ffd2 --- /dev/null +++ b/examples/quickcontrols/extras/flat/images/piemenu-sepia-normal.png diff --git a/examples/quickcontrols/extras/flat/images/piemenu-sepia-pressed.png b/examples/quickcontrols/extras/flat/images/piemenu-sepia-pressed.png Binary files differnew file mode 100644 index 00000000..0f2b3517 --- /dev/null +++ b/examples/quickcontrols/extras/flat/images/piemenu-sepia-pressed.png |
