diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
| commit | 8b36cdd25761348c285305edec1bf861a924e858 (patch) | |
| tree | f4b96b64ad5d93d92ae82e7d18ad60e8d72ce236 /tests/auto/controls/data | |
| parent | d13e4db9d74aefc0bd08ca946b789155a11361fb (diff) | |
| parent | f19b1bf1bfee79178bf5cd75df86863be49c21f0 (diff) | |
| download | qtquickcontrols-8b36cdd25761348c285305edec1bf861a924e858.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
Diffstat (limited to 'tests/auto/controls/data')
| -rw-r--r-- | tests/auto/controls/data/tst_label.qml | 11 | ||||
| -rw-r--r-- | tests/auto/controls/data/tst_slider.qml | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index e5c53a52..145c7f14 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -69,6 +69,17 @@ TestCase { label.destroy() } + function test_textPaddings() { + var label = Qt.createQmlObject('import QtQuick.Controls 1.2; Label { leftPadding: 2; rightPadding: 2; topPadding: 2; bottomPadding: 2 }', testCase, ''); + + compare(label.leftPadding, 2) + compare(label.rightPadding, 2) + compare(label.topPadding, 2) + compare(label.bottomPadding, 2) + + label.destroy() + } + function test_activeFocusOnTab() { if (Qt.styleHints.tabFocusBehavior != Qt.TabFocusAllControls) skip("This function doesn't support NOT iterating all.") diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 4cff6352..a27cf70e 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -346,7 +346,7 @@ Item { // drag less than the threshold distance mouseMove(control, pt.x + Settings.dragThreshold - 1, pt.y) - compare(control.value, 0.5) + verify(control.value > 0.5) // drag over the threshold mouseMove(control, pt.x + Settings.dragThreshold + 1, pt.y) |