diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml | 7 | ||||
| -rw-r--r-- | tests/auto/extras/data/tst_tumbler.qml | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml index 591271552..7c9ebeac1 100644 --- a/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml +++ b/tests/auto/controls/data/toolbutton/tb_checkableActionWithinExclusiveGroup.qml @@ -48,6 +48,7 @@ ** ****************************************************************************/ +import QtQml 2.14 as Qml import QtQuick 2.2 import QtQuick.Controls 1.2 @@ -75,15 +76,17 @@ Row { checked: textinput.font.underline } } - Binding { + Qml.Binding { target: textinput property: "font.bold" value: bold.checked + restoreMode: Binding.RestoreBinding } - Binding { + Qml.Binding { target: textinput property: "font.underline" value: underline.checked + restoreMode: Binding.RestoreBinding } ToolButton { id: _tb1 diff --git a/tests/auto/extras/data/tst_tumbler.qml b/tests/auto/extras/data/tst_tumbler.qml index e3e444714..54365f14d 100644 --- a/tests/auto/extras/data/tst_tumbler.qml +++ b/tests/auto/extras/data/tst_tumbler.qml @@ -349,8 +349,7 @@ Item { var pos = Qt.point(columnXCenter(tumbler, 0), tumbler.__style.padding.top); mouseDrag(tumbler, pos.x, pos.y, 0, tumbler.height - tumbler.__style.padding.bottom, Qt.LeftButton, Qt.NoModifier, 300); - // See QTBUG-78471 - //tryCompare(tumbler.__viewAt(0), "offset", Settings.styleName === "Flat" ? 6.0 : 4.0); + tryCompare(tumbler.__viewAt(0), "offset", Settings.styleName === "Flat" ? 5.0 : 3.0); tumbler.height += 100; var padding = tumbler.__style.padding; |