summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qabstractspinbox.cpp
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-05-28 13:55:45 (GMT)
committeraxis <qt-info@nokia.com>2009-05-28 14:00:24 (GMT)
commit1e96103c5bbd875d9e8607a322409b3abbfb136b (patch)
tree68f170263191242e58f762fe2c2e3f72366326c6 /src/gui/widgets/qabstractspinbox.cpp
parent713833c831fb667fcb6fa4b1aad0dc452d70122f (diff)
downloadQt-1e96103c5bbd875d9e8607a322409b3abbfb136b.zip
Qt-1e96103c5bbd875d9e8607a322409b3abbfb136b.tar.gz
Qt-1e96103c5bbd875d9e8607a322409b3abbfb136b.tar.bz2
Fixed input methods support on all spinbox types.
Diffstat (limited to 'src/gui/widgets/qabstractspinbox.cpp')
-rw-r--r--src/gui/widgets/qabstractspinbox.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp
index 347f89a..2bf1cda 100644
--- a/src/gui/widgets/qabstractspinbox.cpp
+++ b/src/gui/widgets/qabstractspinbox.cpp
@@ -659,7 +659,6 @@ void QAbstractSpinBox::setLineEdit(QLineEdit *lineEdit)
d->edit->setParent(this);
d->edit->setFrame(false);
- d->edit->setAttribute(Qt::WA_InputMethodEnabled, false);
d->edit->setFocusProxy(this);
d->edit->setAcceptDrops(false);
@@ -690,6 +689,18 @@ void QAbstractSpinBox::interpretText()
d->interpret(EmitIfChanged);
}
+/*
+ Reimplemented in 4.6, so be careful.
+ */
+/*!
+ \reimp
+*/
+QVariant QAbstractSpinBox::inputMethodQuery(Qt::InputMethodQuery query) const
+{
+ Q_D(const QAbstractSpinBox);
+ return d->edit->inputMethodQuery(query);
+}
+
/*!
\reimp
*/