diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 23:15:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-05 23:15:28 (GMT) |
| commit | 983bfa4a069b8bf51913be461c6a79c71fa18792 (patch) | |
| tree | 685cb0ab2dde791577cb66877ebc5bedc599dec2 | |
| parent | 6ac4bc5cb7ac7500b39ea6828fdf76e95a2c2f0b (diff) | |
| parent | 89a26ec7ecb758b635087899418eeb703138c482 (diff) | |
| download | Qt-983bfa4a069b8bf51913be461c6a79c71fa18792.zip Qt-983bfa4a069b8bf51913be461c6a79c71fa18792.tar.gz Qt-983bfa4a069b8bf51913be461c6a79c71fa18792.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Hide the cursor in the tested text edit
| -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)); } |