diff options
| author | axis <qt-info@nokia.com> | 2010-10-08 13:27:44 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-10-08 13:27:44 (GMT) |
| commit | a7eab236ca29a06180faa43f982365ae646bb9a3 (patch) | |
| tree | 82fe55a8aa3932f4f64700a12ff4bb1e13eaafea /src/gui/dialogs | |
| parent | f8596b2269631b9522e51bb0a68d86588d4696c7 (diff) | |
| parent | 4ee912a752a4b7f129e98e180328f1f46f053d4f (diff) | |
| download | Qt-a7eab236ca29a06180faa43f982365ae646bb9a3.zip Qt-a7eab236ca29a06180faa43f982365ae646bb9a3.tar.gz Qt-a7eab236ca29a06180faa43f982365ae646bb9a3.tar.bz2 | |
Merge branch '4.7-s60' into master-s60
Conflicts:
src/openvg/qvg_symbian.cpp
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))); |