diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-09-19 17:12:10 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-09-21 08:07:39 (GMT) |
| commit | 6248dff2c7f3288d675de639abfbbc6c1d618006 (patch) | |
| tree | 11c8a736b8b2b3a8fd474225cab630370f369d57 /src/gui/kernel/qwidget.cpp | |
| parent | 789303e0f80a299eb3cfacc1d84dbdc1d3e4abeb (diff) | |
| download | Qt-6248dff2c7f3288d675de639abfbbc6c1d618006.zip Qt-6248dff2c7f3288d675de639abfbbc6c1d618006.tar.gz Qt-6248dff2c7f3288d675de639abfbbc6c1d618006.tar.bz2 | |
Give the soft key functionality it's own macro.
Re-using QT_KEYPAD_NAVIGATION for soft keys is wrong since the two
are independant concepts. This puts everything in a new macro called
QT_SOFTKEYS_ENABLED. This will also insulate the embedded customers
who use keypad navigation from the soft key changes.
Reviewed-by: Alessandro Portale
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 461834c..41d0b23 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -7991,7 +7991,7 @@ bool QWidget::event(QEvent *event) } break; case QEvent::FocusIn: -#ifdef QT_KEYPAD_NAVIGATION +#ifdef QT_SOFTKEYS_ENABLED QSoftKeyManager::updateSoftKeys(); #endif focusInEvent((QFocusEvent*)event); @@ -8144,7 +8144,7 @@ bool QWidget::event(QEvent *event) QApplication::sendEvent(w, event); } -#ifdef QT_KEYPAD_NAVIGATION +#ifdef QT_SOFTKEYS_ENABLED if (isWindow() && isActiveWindow()) QSoftKeyManager::updateSoftKeys(); #endif @@ -8256,7 +8256,7 @@ bool QWidget::event(QEvent *event) case QEvent::ActionAdded: case QEvent::ActionRemoved: case QEvent::ActionChanged: -#ifdef QT_KEYPAD_NAVIGATION +#ifdef QT_SOFTKEYS_ENABLED QSoftKeyManager::updateSoftKeys(true); #endif actionEvent((QActionEvent*)event); |