summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-06-11 12:24:52 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-06-11 12:24:52 (GMT)
commit807dce35f7540c65eab48c8176169c2693f289bd (patch)
tree487c425b84ef1eca67d1a4ebe1b5cea37f6e4986
parentf96d6a5d7d422847d302f4ed1180b66436683191 (diff)
parent787b56fbcad2eda8ababc919a535fb2f9ef48fb5 (diff)
downloadQt-807dce35f7540c65eab48c8176169c2693f289bd.zip
Qt-807dce35f7540c65eab48c8176169c2693f289bd.tar.gz
Qt-807dce35f7540c65eab48c8176169c2693f289bd.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
-rw-r--r--tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
index 558d4de..3125258 100644
--- a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -3148,8 +3148,8 @@ void tst_QDateTimeEdit::nextPrevSection()
EditorDateEdit edit;
edit.setDisplayFormat("hh/mm/bc9ss");
edit.setTime(QTime(12, 34, 56));
- edit.setSelectedSection(QDateTimeEdit::MinuteSection);
edit.show();
+ edit.setSelectedSection(QDateTimeEdit::MinuteSection);
QCOMPARE(edit.lineEdit()->selectedText(), QString("34")); // selftest
QTest::keyClick(&edit, key, modifiers);
QCOMPARE(edit.lineEdit()->selectedText(), selectedText);