diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-07 17:20:24 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-07 17:24:19 +0200 |
| commit | a3b706531b98c64137acaebf26756828cd43a2a0 (patch) | |
| tree | b04490213d60519b8a0c90f9c166eef862ed185b /src/quicktemplates2/qquickrangeslider.cpp | |
| parent | 2f4a059881dbec289d86abc7456b42d5eec77ceb (diff) | |
| parent | c2b7e55af43518ae1898eddf8611ef617149ca8a (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-progressbar-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-checked.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-radiobutton-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-first-handle-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-rangeslider-second-handle.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-disabled.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-focused.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-slider-normal.qml
src/imports/controls/doc/snippets/screenshots/qtquickcontrols2-tabbar-explicit.qml
src/quicktemplates2/qquickmenu.cpp
tests/auto/controls/data/tst_buttongroup.qml
tests/auto/controls/data/tst_swipedelegate.qml
Change-Id: Ib6042a0ad716f557927e7412d17ea8957d06c015
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickrangeslider.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/quicktemplates2/qquickrangeslider.cpp b/src/quicktemplates2/qquickrangeslider.cpp index 34654fe1..a4862fa6 100644 --- a/src/quicktemplates2/qquickrangeslider.cpp +++ b/src/quicktemplates2/qquickrangeslider.cpp @@ -56,17 +56,6 @@ QT_BEGIN_NAMESPACE RangeSlider is used to select a range specified by two values, by sliding each handle along a track. - \table - \row \li \image qtquickcontrols2-rangeslider-normal.png - \li A range slider in its normal state. - \row \li \image qtquickcontrols2-rangeslider-first-handle-focused.png - \li A range slider whose first handle has active focus. - \row \li \image qtquickcontrols2-rangeslider-second-handle-focused.png - \li A range slider whose second handle has active focus. - \row \li \image qtquickcontrols2-rangeslider-disabled.png - \li A range slider that is disabled. - \endtable - \code RangeSlider { first.value: 0.25 |