diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-06 17:05:51 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-06 17:05:51 +0100 |
| commit | a4d9ee1d3404ee9c575cc5682a31dc3eccfa7792 (patch) | |
| tree | dc30737ce19a1e6b4319235b5845cf4db51bdf31 /tests/auto/qtextedit | |
| parent | 8b01937c36632fca8774e90d22ce2aaeb2df883d (diff) | |
| parent | 983bfa4a069b8bf51913be461c6a79c71fa18792 (diff) | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'tests/auto/qtextedit')
| -rw-r--r-- | tests/auto/qtextedit/tst_qtextedit.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp index 321aa22821..d1832d8cb5 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)); } |