diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-17 10:53:44 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-17 10:53:44 (GMT) |
| commit | 160252d5d1facf2a53af1314836f22fb00784625 (patch) | |
| tree | e1a6a0be850671e32af0306ffd8b0c4a780da720 /tests/auto/qlineedit | |
| parent | fd73185195633fd97228a0c832c247b761967598 (diff) | |
| parent | cfa04d53ff58d45d7811637c8be76099740d25c5 (diff) | |
| download | Qt-160252d5d1facf2a53af1314836f22fb00784625.zip Qt-160252d5d1facf2a53af1314836f22fb00784625.tar.gz Qt-160252d5d1facf2a53af1314836f22fb00784625.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/qpainterpath/tst_qpainterpath.cpp
Diffstat (limited to 'tests/auto/qlineedit')
| -rw-r--r-- | tests/auto/qlineedit/tst_qlineedit.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp index 8779831..ea1f79f 100644 --- a/tests/auto/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/qlineedit/tst_qlineedit.cpp @@ -1466,14 +1466,10 @@ void tst_QLineEdit::textMask_data() void tst_QLineEdit::textMask() { -#if (QT_VERSION-0 >= 0x030303) QFETCH( QString, insertString ); testWidget->setInputMask( "#" ); testWidget->setText( insertString ); QCOMPARE( testWidget->text(), insertString ); -#else - QSKIP( "This test function tests a problem with masks that was fixed in 3.3", SkipAll); -#endif } void tst_QLineEdit::setText() |