diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-05-27 09:34:08 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-05-27 09:34:08 (GMT) |
| commit | 552bdd2b5f4ff71fe04574172abca24c898e3f41 (patch) | |
| tree | 1e87d3adfe15fa0d00ab32db8d282419124f8aa9 /src/gui/kernel/qsoftkeymanager.cpp | |
| parent | 53cdd1c64b0c73fa5fc4833512c0253224b6f013 (diff) | |
| download | Qt-552bdd2b5f4ff71fe04574172abca24c898e3f41.zip Qt-552bdd2b5f4ff71fe04574172abca24c898e3f41.tar.gz Qt-552bdd2b5f4ff71fe04574172abca24c898e3f41.tar.bz2 | |
Fix non-Symbian builds broken by previous commit.
Task-number: QT-5065
Reviewed-by: Sami Merila
Diffstat (limited to 'src/gui/kernel/qsoftkeymanager.cpp')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index c2c4fb2..1150601 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -50,7 +50,7 @@ #include "private/qsoftkeymanager_s60_p.h" #endif -#ifndef SYMBIAN_VERSION_9_4 +#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4) #include "private/qt_s60_p.h" #endif @@ -105,7 +105,7 @@ QSoftKeyManager::QSoftKeyManager() : QAction *QSoftKeyManager::createAction(StandardSoftKey standardKey, QWidget *actionWidget) { QAction *action = new QAction(standardSoftKeyText(standardKey), actionWidget); -#ifndef SYMBIAN_VERSION_9_4 +#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4) int key = 0; switch (standardKey) { case OkSoftKey: @@ -171,7 +171,7 @@ void QSoftKeyManager::cleanupHash(QObject *obj) Q_D(QSoftKeyManager); QAction *action = qobject_cast<QAction*>(obj); d->keyedActions.remove(action); -#ifndef SYMBIAN_VERSION_9_4 +#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4) d->softKeyCommandActions.remove(action); #endif } |