diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-06 23:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-06 23:00:11 (GMT) |
| commit | 2c74c74a4b9fca65624d72525066501be9b50142 (patch) | |
| tree | 10d301c1c7a8b64b3a36e62c80dc33f3623efe78 /tests | |
| parent | 4027b59d8ea97821301db7c66607fb8fe1ef295b (diff) | |
| parent | 983bfa4a069b8bf51913be461c6a79c71fa18792 (diff) | |
| download | Qt-2c74c74a4b9fca65624d72525066501be9b50142.zip Qt-2c74c74a4b9fca65624d72525066501be9b50142.tar.gz Qt-2c74c74a4b9fca65624d72525066501be9b50142.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tests')
| -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)); } |