diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-10-06 14:35:19 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-06 14:50:08 +0200 |
commit | e3dac16b8da272c14c169227a8befe07e7852126 (patch) | |
tree | 6eab60915f922305373a1cf49b065a7466438ab5 /src/quicktemplates2/qquickrangeslider.cpp | |
parent | d03c8de38f5838c237b8c2fb50739d770c5fc14e (diff) | |
parent | 2f4a059881dbec289d86abc7456b42d5eec77ceb (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/controls/Dial.qml
src/imports/controls/RangeSlider.qml
src/imports/controls/Slider.qml
src/imports/controls/Tumbler.qml
src/imports/controls/material/Dial.qml
src/imports/controls/material/RangeSlider.qml
src/imports/controls/material/Slider.qml
src/imports/controls/material/Tumbler.qml
src/imports/controls/qtquickcontrols2plugin.cpp
src/imports/controls/universal/Dial.qml
src/imports/controls/universal/RangeSlider.qml
src/imports/controls/universal/Slider.qml
src/imports/controls/universal/Tumbler.qml
Change-Id: I02b433e66109d90c63fcb9d0e5e304dc9375ea44
Diffstat (limited to 'src/quicktemplates2/qquickrangeslider.cpp')
0 files changed, 0 insertions, 0 deletions