Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
index be19cbc9d1..2ce75620cf 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
@@ -209,12 +209,12 @@ void tst_QPlainTextEdit::getSetCheck()
 
     // int QPlainTextEdit::tabStopWidth()
     // void QPlainTextEdit::setTabStopWidth(int)
-    obj1.setTabStopWidth(0);
-    QCOMPARE(0, obj1.tabStopWidth());
-    obj1.setTabStopWidth(INT_MIN);
-    QCOMPARE(0, obj1.tabStopWidth()); // Makes no sense to set a negative tabstop value
-    obj1.setTabStopWidth(INT_MAX);
-    QCOMPARE(INT_MAX, obj1.tabStopWidth());
+    obj1.setTabStopDistance(0);
+    QCOMPARE(0, obj1.tabStopDistance());
+    obj1.setTabStopDistance(-1);
+    QCOMPARE(0, obj1.tabStopDistance()); // Makes no sense to set a negative tabstop value
+    obj1.setTabStopDistance(std::numeric_limits<qreal>::max());
+    QCOMPARE(std::numeric_limits<qreal>::max(), obj1.tabStopDistance());
 }
 
 class QtTestDocumentLayout : public QAbstractTextDocumentLayout