summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtextedit
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-06 16:05:51 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-06 16:05:51 (GMT)
commita4d9ee1d3404ee9c575cc5682a31dc3eccfa7792 (patch)
treedc30737ce19a1e6b4319235b5845cf4db51bdf31 /tests/auto/qtextedit
parent8b01937c36632fca8774e90d22ce2aaeb2df883d (diff)
parent983bfa4a069b8bf51913be461c6a79c71fa18792 (diff)
downloadQt-a4d9ee1d3404ee9c575cc5682a31dc3eccfa7792.zip
Qt-a4d9ee1d3404ee9c575cc5682a31dc3eccfa7792.tar.gz
Qt-a4d9ee1d3404ee9c575cc5682a31dc3eccfa7792.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tests/auto/qtextedit')
-rw-r--r--tests/auto/qtextedit/tst_qtextedit.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 321aa22..d1832d8 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -2163,6 +2163,9 @@ void tst_QTextEdit::noWrapBackgrounds()
QTextEdit edit;
edit.setLineWrapMode(QTextEdit::NoWrap);
+ // hide the cursor in order to make the image comparison below reliable
+ edit.setCursorWidth(0);
+
QTextFrame *root = edit.document()->rootFrame();
QTextFrameFormat frameFormat = root->frameFormat();
frameFormat.setLeftMargin(2);
@@ -2178,8 +2181,6 @@ void tst_QTextEdit::noWrapBackgrounds()
layout->addWidget(&edit);
topLevel.show();
- QTest::qWait(1000);
-
QImage img = QPixmap::grabWidget(edit.viewport()).toImage();
QCOMPARE(img, img.mirrored(true, false));
}