diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-08 22:54:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-08 22:54:48 (GMT) |
| commit | 1b08e9bf28ba4f2c49b9240abc59f805802bdc1d (patch) | |
| tree | b2c865a6feec197a0034a7b82a2cd43e2a025ff6 /tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp | |
| parent | d29c604b0365dfbc20f8aea8d2cb63f621995219 (diff) | |
| parent | f52dc5bf1e885c9a4d226c2484249e7d9faf0a99 (diff) | |
| download | Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.zip Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.tar.gz Qt-1b08e9bf28ba4f2c49b9240abc59f805802bdc1d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp')
| -rw-r--r-- | tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp index 6162be0..aa3ccb7 100644 --- a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp +++ b/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp @@ -52,6 +52,9 @@ #include <qlineedit.h> #include <qdebug.h> + +#include "../../shared/util.h" + //TESTED_CLASS= //TESTED_FILES=gui/widgets/qspinbox.h gui/widgets/qspinbox.cpp gui/widgets/qabstractspinbox.cpp gui/widgets/qabstractspinbox_p.h gui/widgets/qabstractspinbox.h @@ -772,8 +775,8 @@ void tst_QDoubleSpinBox::editingFinished() layout->addWidget(box2); testFocusWidget->show(); - QTest::qWait(100); - QVERIFY(box->isActiveWindow()); + QTest::qWait(10); + QTRY_VERIFY(box->isActiveWindow()); box->setFocus(); QSignalSpy editingFinishedSpy1(box, SIGNAL(editingFinished())); |