From 48d25e6c9fcb5644ff6d9fdbe876c0a49413c583 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Thu, 18 Feb 2010 09:52:54 +0200 Subject: Fixed softkey localizaton to comile also on platforms without softkeys. Task-number: QTBUG-6785 Reviewed-by: TrustMe --- src/gui/widgets/qcombobox.cpp | 2 ++ 1 file changed, 2 insertions(+) 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); -- cgit v0.12