diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2010-02-18 07:52:54 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2010-02-18 07:55:17 (GMT) |
| commit | 48d25e6c9fcb5644ff6d9fdbe876c0a49413c583 (patch) | |
| tree | ad84f14aeb006e2442a66e97cb68d652b699024c /src/gui | |
| parent | 3e279309f818fcac44d0badfd9b8fa91f853cfd4 (diff) | |
| download | Qt-48d25e6c9fcb5644ff6d9fdbe876c0a49413c583.zip Qt-48d25e6c9fcb5644ff6d9fdbe876c0a49413c583.tar.gz Qt-48d25e6c9fcb5644ff6d9fdbe876c0a49413c583.tar.bz2 | |
Fixed softkey localizaton to comile also on platforms without softkeys.
Task-number: QTBUG-6785
Reviewed-by: TrustMe
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index c4340e2..585db70 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -607,9 +607,11 @@ void QComboBoxPrivateContainer::changeEvent(QEvent *e) view->setMouseTracking(combo->style()->styleHint(QStyle::SH_ComboBox_ListMouseTracking, &opt, combo) || combo->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, combo)); setFrameStyle(combo->style()->styleHint(QStyle::SH_ComboBox_PopupFrameStyle, &opt, combo)); +#ifdef QT_SOFTKEYS_ENABLED } else if (e->type() == QEvent::LanguageChange) { selectAction->setText(QSoftKeyManager::standardSoftKeyText(QSoftKeyManager::SelectSoftKey)); cancelAction->setText(QSoftKeyManager::standardSoftKeyText(QSoftKeyManager::CancelSoftKey)); +#endif } QWidget::changeEvent(e); |