diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 16:00:13 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-03 16:00:13 +0100 |
| commit | 3f646aca34c25f7cc36df2f988790bb238026422 (patch) | |
| tree | 2f8c3022a7b7c1ec15db3ca528a3e7c604a18a63 /src/imports/controls/doc/images | |
| parent | c4a5b64abacad55e8b805bc1b1eaa877b0c945bb (diff) | |
| parent | d59476a0bb93c806c5dfb8bf998b50025ed4f852 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
tests/auto/accessibility/tst_accessibility.cpp
Change-Id: I8c3ccb301730ecdc0acdcb75de607cdd4f753e15
Diffstat (limited to 'src/imports/controls/doc/images')
| -rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-scrollbar-non-attached.png | bin | 0 -> 5459 bytes |
| -rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-non-attached.png | bin | 0 -> 5280 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-non-attached.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-non-attached.png Binary files differnew file mode 100644 index 00000000..8817ad5c --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-non-attached.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-non-attached.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-non-attached.png Binary files differnew file mode 100644 index 00000000..758e0451 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-non-attached.png |
