summaryrefslogtreecommitdiffstats
path: root/tests/auto/qspinbox/tst_qspinbox.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-12-03 08:39:08 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-12-03 08:39:08 (GMT)
commite1ef51cdddf4187ab68d09f42438e45a6bbf85f4 (patch)
treee1a59bdb9e3695f43064b6fa7f6ab33d5ef359ca /tests/auto/qspinbox/tst_qspinbox.cpp
parentb495786061febf5e4c6baddbd6443f44f142c627 (diff)
parent82a63405863f527028302ceaeff957f9ee5176e2 (diff)
downloadQt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.zip
Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.tar.gz
Qt-e1ef51cdddf4187ab68d09f42438e45a6bbf85f4.tar.bz2
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'tests/auto/qspinbox/tst_qspinbox.cpp')
-rw-r--r--tests/auto/qspinbox/tst_qspinbox.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/qspinbox/tst_qspinbox.cpp b/tests/auto/qspinbox/tst_qspinbox.cpp
index 655de15..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()));
@@ -1018,13 +1018,17 @@ void tst_QSpinBox::taskQTBUG_5008_textFromValueAndValidate()
setValue(1000000);
}
+ QLineEdit *lineEdit() const
+ {
+ return QSpinBox::lineEdit();
+ }
+
//we use the French delimiters here
QString textFromValue (int value) const
{
return locale().toString(value);
}
- using QSpinBox::lineEdit;
} spinbox;
spinbox.show();
spinbox.activateWindow();