diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-27 08:40:32 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-27 08:40:32 (GMT) |
| commit | aa911fcc8cae12c92941e21a02b7621d4e4bf118 (patch) | |
| tree | fb9a70e68e60d46a6e773ca82d67411a2720f60c /tests/auto/qspinbox/tst_qspinbox.cpp | |
| parent | f50cfa3a5a6b8408276e540a52f4232568c871fa (diff) | |
| parent | 9401bfd65309da360df6c2bda5f910b1507e7888 (diff) | |
| download | Qt-aa911fcc8cae12c92941e21a02b7621d4e4bf118.zip Qt-aa911fcc8cae12c92941e21a02b7621d4e4bf118.tar.gz Qt-aa911fcc8cae12c92941e21a02b7621d4e4bf118.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'tests/auto/qspinbox/tst_qspinbox.cpp')
| -rw-r--r-- | tests/auto/qspinbox/tst_qspinbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qspinbox/tst_qspinbox.cpp b/tests/auto/qspinbox/tst_qspinbox.cpp index d2fe2ac..655de15 100644 --- a/tests/auto/qspinbox/tst_qspinbox.cpp +++ b/tests/auto/qspinbox/tst_qspinbox.cpp @@ -1010,7 +1010,6 @@ void tst_QSpinBox::taskQTBUG_5008_textFromValueAndValidate() { class DecoratedSpinBox : public QSpinBox { - friend class tst_QSpinBox; public: DecoratedSpinBox() { @@ -1024,6 +1023,8 @@ void tst_QSpinBox::taskQTBUG_5008_textFromValueAndValidate() { return locale().toString(value); } + + using QSpinBox::lineEdit; } spinbox; spinbox.show(); spinbox.activateWindow(); |