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/widgets/qcombobox_p.h | |
| 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/widgets/qcombobox_p.h')
| -rw-r--r-- | src/gui/widgets/qcombobox_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox_p.h b/src/gui/widgets/qcombobox_p.h index cd0861d..f7458c4 100644 --- a/src/gui/widgets/qcombobox_p.h +++ b/src/gui/widgets/qcombobox_p.h @@ -255,7 +255,7 @@ private: QAbstractItemView *view; QComboBoxPrivateScroller *top; QComboBoxPrivateScroller *bottom; -#ifdef QT_KEYPAD_NAVIGATION +#ifdef QT_SOFTKEYS_ENABLED QAction *selectAction; QAction *cancelAction; #endif |