diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-06 23:00:11 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-06 23:00:11 (GMT) |
| commit | 146f97525ca49822bb684e1e4d9e62ff5484da36 (patch) | |
| tree | a69f1e18652dbd5a6eb63df2f6395309c87b7af2 | |
| parent | 84de3d47a2fd5400920ad570b443b6bb95c8c766 (diff) | |
| parent | 983bfa4a069b8bf51913be461c6a79c71fa18792 (diff) | |
| download | Qt-146f97525ca49822bb684e1e4d9e62ff5484da36.zip Qt-146f97525ca49822bb684e1e4d9e62ff5484da36.tar.gz Qt-146f97525ca49822bb684e1e4d9e62ff5484da36.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
| -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 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)); } |