summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-10-01 11:25:28 (GMT)
committeraxis <qt-info@nokia.com>2010-10-08 13:03:54 (GMT)
commit4ee912a752a4b7f129e98e180328f1f46f053d4f (patch)
tree18b991616665a01132dfb068647b1d96a8ab4c1c /src/gui/dialogs
parentaa0f3a7745472ea8c9ca43bb7d690a0591bde83b (diff)
downloadQt-4ee912a752a4b7f129e98e180328f1f46f053d4f.zip
Qt-4ee912a752a4b7f129e98e180328f1f46f053d4f.tar.gz
Qt-4ee912a752a4b7f129e98e180328f1f46f053d4f.tar.bz2
Added support for using inputMethodHints in QInputDialog edit widget.
AutoTest: Included Task: QTBUG-13200 RevBy: Denis Dzyubenko
Diffstat (limited to 'src/gui/dialogs')
-rw-r--r--src/gui/dialogs/qinputdialog.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/dialogs/qinputdialog.cpp b/src/gui/dialogs/qinputdialog.cpp
index e996ee9..700b234 100644
--- a/src/gui/dialogs/qinputdialog.cpp
+++ b/src/gui/dialogs/qinputdialog.cpp
@@ -244,6 +244,9 @@ void QInputDialogPrivate::ensureLineEdit()
Q_Q(QInputDialog);
if (!lineEdit) {
lineEdit = new QLineEdit(q);
+#ifndef QT_NO_IM
+ qt_widget_private(lineEdit)->inheritsInputMethodHints = 1;
+#endif
lineEdit->hide();
QObject::connect(lineEdit, SIGNAL(textChanged(QString)),
q, SLOT(_q_textChanged(QString)));
@@ -255,6 +258,9 @@ void QInputDialogPrivate::ensureComboBox()
Q_Q(QInputDialog);
if (!comboBox) {
comboBox = new QComboBox(q);
+#ifndef QT_NO_IM
+ qt_widget_private(comboBox)->inheritsInputMethodHints = 1;
+#endif
comboBox->hide();
QObject::connect(comboBox, SIGNAL(editTextChanged(QString)),
q, SLOT(_q_textChanged(QString)));