diff options
| author | aavit <qt-info@nokia.com> | 2011-06-09 07:36:34 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-06-09 07:36:34 (GMT) |
| commit | 161fd33b199c96a92fbda4b009e85f910f73acc0 (patch) | |
| tree | 736e139d09f8cf8fee5fa4315fb3381d5c4f492b /src/gui/kernel/qsoftkeymanager_common_p.h | |
| parent | 809fc41c9b19388a21ee8e23601156579780cda3 (diff) | |
| parent | 3916feefc5ebadba3320029a29ecf02d8934e879 (diff) | |
| download | Qt-161fd33b199c96a92fbda4b009e85f910f73acc0.zip Qt-161fd33b199c96a92fbda4b009e85f910f73acc0.tar.gz Qt-161fd33b199c96a92fbda4b009e85f910f73acc0.tar.bz2 | |
Merge remote branch 'qt-mainline/4.8'
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager_common_p.h')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_common_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qsoftkeymanager_common_p.h b/src/gui/kernel/qsoftkeymanager_common_p.h index bf4c747..5b76e60 100644 --- a/src/gui/kernel/qsoftkeymanager_common_p.h +++ b/src/gui/kernel/qsoftkeymanager_common_p.h @@ -72,7 +72,7 @@ protected: QMultiHash<int, QAction*> requestedSoftKeyActions; QWidget *initialSoftKeySource; bool pendingUpdate; -#ifdef SYMBIAN_VERSION_SYMBIAN3 +#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4) QHash<QAction*, int> softKeyCommandActions; #endif }; |