diff options
| author | axis <qt-info@nokia.com> | 2009-11-30 09:05:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-30 09:05:34 (GMT) |
| commit | 47ad7aae65756f4d646cd70db563d5a394c23ab2 (patch) | |
| tree | 0be82f505f0389e9b540c240f5c6886adaa80527 | |
| parent | 56c8393c5830045f599a22edbe4fd17c18dc827d (diff) | |
| parent | b6029c998fcd38de95711fa6e1ff4d8b522f8bde (diff) | |
| download | Qt-47ad7aae65756f4d646cd70db563d5a394c23ab2.zip Qt-47ad7aae65756f4d646cd70db563d5a394c23ab2.tar.gz Qt-47ad7aae65756f4d646cd70db563d5a394c23ab2.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-staging2
| -rw-r--r-- | tests/auto/qspinbox/tst_qspinbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qspinbox/tst_qspinbox.cpp b/tests/auto/qspinbox/tst_qspinbox.cpp index b5e37f2..cd65135 100644 --- a/tests/auto/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/qspinbox/tst_qspinbox.cpp @@ -758,7 +758,7 @@ void tst_QSpinBox::editingFinished() box->activateWindow(); box->setFocus(); - QTRY_COMPARE(qApp->focusWidget(), box); + QTRY_COMPARE(qApp->focusWidget(), (QWidget *)box); QSignalSpy editingFinishedSpy1(box, SIGNAL(editingFinished())); QSignalSpy editingFinishedSpy2(box2, SIGNAL(editingFinished())); |