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_s60.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_s60.cpp')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_s60.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 |