diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-11 20:21:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-11 20:21:33 +0200 |
commit | 41d9718bc4ac005b82d64db8a4312e7fef7548d9 (patch) | |
tree | 80083387e08fa6396bab85908fd9ff896e7413f8 /src/imports | |
parent | 1acb34a40ea0fbc0c0730cdc81dcfd46bdeb4ef7 (diff) | |
parent | 87cbcbf9972321f26fa47ded04005f30bb2a279d (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/imports/controls/ScrollBar.qml
src/imports/controls/material/ScrollBar.qml
src/imports/controls/universal/ScrollBar.qml
src/templates/qquickscrollbar.cpp
tests/auto/controls/data/tst_scrollbar.qml
Change-Id: I646882e0563f72df682bac49f96875a08b1b0de9
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png | bin | 5283 -> 1795 bytes |
-rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png | bin | 5283 -> 1795 bytes |
-rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols-universal-button.png | bin | 2172 -> 674 bytes |
-rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols-universal-dark.png | bin | 5450 -> 2894 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png Binary files differindex d45ae400..f612c243 100644 --- a/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png +++ b/src/imports/controls/doc/images/qtquickcontrols-applicationwindow-wireframe.png diff --git a/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png b/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png Binary files differindex d45ae400..f612c243 100644 --- a/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png +++ b/src/imports/controls/doc/images/qtquickcontrols-page-wireframe.png diff --git a/src/imports/controls/doc/images/qtquickcontrols-universal-button.png b/src/imports/controls/doc/images/qtquickcontrols-universal-button.png Binary files differindex 6ddec823..6c764ec9 100644 --- a/src/imports/controls/doc/images/qtquickcontrols-universal-button.png +++ b/src/imports/controls/doc/images/qtquickcontrols-universal-button.png diff --git a/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png b/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png Binary files differindex 98701550..ec459457 100644 --- a/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png +++ b/src/imports/controls/doc/images/qtquickcontrols-universal-dark.png |