3 files changed, 6 insertions, 6 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
 }
diff --git a/src/gui/kernel/qsoftkeymanager_common_p.h b/src/gui/kernel/qsoftkeymanager_common_p.h
index 830881d..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;
-#ifndef SYMBIAN_VERSION_9_4
+#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4)
     QHash<QAction*, int> softKeyCommandActions;
 #endif
 };
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp
index 503277b..773743a 100644
--- a/src/gui/kernel/qsoftkeymanager_s60.cpp
+++ b/src/gui/kernel/qsoftkeymanager_s60.cpp
@@ -113,7 +113,7 @@ void QSoftKeyManagerPrivateS60::ensureCbaVisibilityAndResponsiviness(CEikButtonG
 
 void QSoftKeyManagerPrivateS60::clearSoftkeys(CEikButtonGroupContainer &cba)
 {
-#ifndef SYMBIAN_VERSION_9_4
+#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4)
     QT_TRAP_THROWING(
         //EAknSoftkeyEmpty is used, because using -1 adds softkeys without actions on Symbian3
         cba.SetCommandL(0, EAknSoftkeyEmpty, KNullDesC);
@@ -303,7 +303,7 @@ bool QSoftKeyManagerPrivateS60::setSoftkey(CEikButtonGroupContainer &cba,
         QString text = softkeyText(*action);
         TPtrC nativeText = qt_QString2TPtrC(text);
         int command = S60_COMMAND_START + position;
-#ifndef SYMBIAN_VERSION_9_4
+#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4)
         if (softKeyCommandActions.contains(action))
             command = softKeyCommandActions.value(action);
 #endif