diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-12 06:37:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-12 06:37:02 (GMT) |
| commit | 1c20abaaeef1ab448526e5821db06350537c1333 (patch) | |
| tree | 554a714b3b3b39807e046faeb612a67401c4b219 /tests | |
| parent | a653056f806a3410b4aa76df78fae736d4f93791 (diff) | |
| parent | 787b56fbcad2eda8ababc919a535fb2f9ef48fb5 (diff) | |
| download | Qt-1c20abaaeef1ab448526e5821db06350537c1333.zip Qt-1c20abaaeef1ab448526e5821db06350537c1333.tar.gz Qt-1c20abaaeef1ab448526e5821db06350537c1333.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Show EditorDateEdit before changing selection in qdatetimeedit test
Moved runonphone target to prf files for all build systems.
Incorrectly named keys in QS60StyleEnums::SkinParts
Fix recursive targets for src.pro
Fix recursive 'make sis' for symbian builds
Fixed destdir not being defined.
Enable runonphone target for libraries as well.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp | 2 |
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); |