diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-09 22:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-09 22:00:15 (GMT) |
| commit | c4876f7b430246d4158528392a7a6f58bb87b23e (patch) | |
| tree | 5893e5433dbd3f7c9bcbdb61c46e5be9298cf313 /src/gui/dialogs | |
| parent | e1fead7c4f877308c2cc11131c445a1f7085baf7 (diff) | |
| parent | 4809920df3c3329d47f595c1287ab44b454abb88 (diff) | |
| download | Qt-c4876f7b430246d4158528392a7a6f58bb87b23e.zip Qt-c4876f7b430246d4158528392a7a6f58bb87b23e.tar.gz Qt-c4876f7b430246d4158528392a7a6f58bb87b23e.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qinputdialog.cpp | 6 |
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))); |