summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorFabian Bumberger <fbumberger@rim.com>2014-04-03 12:52:19 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-04 10:40:25 +0200
commit11b8794456e4abb5c2068bb1ee1067fcdf79baa1 (patch)
tree88fa076b04d83ec82f4996d57eb4ad074b8d64aa /tests/auto
parent5947fda8fd45b424461d0b9fa8334d3a6185df72 (diff)
Fix QTextEdit autotest
Change-Id: I2178f1bb09f334ac518ede8f08c5b9268ea0c505 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index 53c76a0da6..8695c8b29a 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -2018,6 +2018,7 @@ void tst_QTextEdit::fullWidthSelection2()
QPalette myPalette;
myPalette.setColor(QPalette::All, QPalette::HighlightedText, QColor(0,0,0,0));
myPalette.setColor(QPalette::All, QPalette::Highlight, QColor(239,221,85));
+ myPalette.setColor(QPalette::All, QPalette::Base, QColor(255,255,255));
QTextEdit widget;
widget.setPalette(myPalette);
@@ -2218,7 +2219,7 @@ void tst_QTextEdit::twoSameInputMethodEvents()
QInputMethodEvent event("PreEditText", attributes);
QApplication::sendEvent(ed, &event);
- QCOMPARE(ed->document()->firstBlock().layout()->lineCount(), 1);
+ QTRY_COMPARE(ed->document()->firstBlock().layout()->lineCount(), 1);
QApplication::sendEvent(ed, &event);
QCOMPARE(ed->document()->firstBlock().layout()->lineCount(), 1);
}