diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-25 11:02:44 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-25 11:03:53 +0100 |
| commit | 5ada1525e03116326a480fb05611904d3484c296 (patch) | |
| tree | f23822e6b0482012065b9586d95cb8ab5d70c4bf /src/imports/controls/Slider.qml | |
| parent | f4f5e857447d42738b1b60b5c4184f39df2f1593 (diff) | |
| parent | 4f1fb09ed70c69e73f2e19f28f4299f4cfbc90dc (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.gitignore
src/templates/qquickcombobox_p.h
src/templates/qquickmenu_p.h
src/templates/qquickmenu_p_p.h
src/templates/qquickoverlay_p.h
src/templates/qquickpopup.cpp
src/templates/qquickpopup_p.h
src/templates/qquickstackview_p.cpp
Change-Id: I89c7d518697beec0b81ef3a12205286a4f3ccf89
Diffstat (limited to 'src/imports/controls/Slider.qml')
| -rw-r--r-- | src/imports/controls/Slider.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 250dbd3a..95cfc54e 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -57,7 +57,7 @@ T.Slider { implicitHeight: 28 radius: width / 2 border.color: "#353637" - color: control.pressed ? "#bdbebf" : "#ffffff" + color: control.pressed ? "#bdbebf" : "#f6f6f6" readonly property bool horizontal: control.orientation === Qt.Horizontal } |