diff options
-rw-r--r-- | src/quicktemplates2/qquickdial.cpp | 4 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_dial.qml | 3 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml | 1 | ||||
-rw-r--r-- | tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquickdial.cpp b/src/quicktemplates2/qquickdial.cpp index 1ebbbd63..05773871 100644 --- a/src/quicktemplates2/qquickdial.cpp +++ b/src/quicktemplates2/qquickdial.cpp @@ -95,7 +95,7 @@ public: stepSize(0), pressed(false), snapMode(QQuickDial::NoSnap), - wrap(true), + wrap(false), handle(nullptr) { } @@ -373,7 +373,7 @@ void QQuickDial::setSnapMode(SnapMode mode) \image qtquickcontrols2-dial-no-wrap.gif - The default value is \c true. + The default value is \c false. */ bool QQuickDial::wrap() const { diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml index 0f7a4f85..b255f423 100644 --- a/tests/auto/controls/data/tst_dial.qml +++ b/tests/auto/controls/data/tst_dial.qml @@ -179,6 +179,7 @@ TestCase { } function test_dragging(data) { + dial.wrap = true; verify(dial.wrap); dial.from = data.from; dial.to = data.to; @@ -212,7 +213,7 @@ TestCase { } function test_nonWrapping() { - dial.wrap = false; + compare(dial.wrap, false); dial.value = 0; // Ensure that dragging from bottom left to bottom right doesn't work. diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml index a27a975b..55d744ec 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-dial-no-wrap.qml @@ -51,7 +51,6 @@ Window { Dial { id: dial - wrap: false anchors.centerIn: parent } } diff --git a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml index 55d744ec..ccd4f88c 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-dial-wrap.qml @@ -51,6 +51,7 @@ Window { Dial { id: dial + wrap: true anchors.centerIn: parent } } |