diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-05-27 07:48:18 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2011-05-27 08:08:15 (GMT) |
| commit | 53cdd1c64b0c73fa5fc4833512c0253224b6f013 (patch) | |
| tree | 397af0fd3a4a717ea5e071022e2384dbe5b26cca /src/gui/kernel | |
| parent | 1a5efee93dd78d5c4962e69ee1f6d6b99d8b9aab (diff) | |
| download | Qt-53cdd1c64b0c73fa5fc4833512c0253224b6f013.zip Qt-53cdd1c64b0c73fa5fc4833512c0253224b6f013.tar.gz Qt-53cdd1c64b0c73fa5fc4833512c0253224b6f013.tar.bz2 | |
Fix SYMBIAN_VERSION_* ifdeffing
QFileDialog and QSoftkeyManager broke in S60 5.3 platform because
incorrect version ifdeffing.
Task-number: QT-5065
Reviewed-by: Sami Merila
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager.cpp | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_common_p.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qsoftkeymanager_s60.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp index 7d7c56f..c2c4fb2 100644 --- a/src/gui/kernel/qsoftkeymanager.cpp +++ b/src/gui/kernel/qsoftkeymanager.cpp @@ -50,7 +50,7 @@ #include "private/qsoftkeymanager_s60_p.h" #endif -#ifdef SYMBIAN_VERSION_SYMBIAN3 +#ifndef 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); -#ifdef SYMBIAN_VERSION_SYMBIAN3 +#ifndef 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); -#ifdef SYMBIAN_VERSION_SYMBIAN3 +#ifndef 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 bf4c747..830881d 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 +#ifndef 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 cd1b444..503277b 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) { -#ifdef SYMBIAN_VERSION_SYMBIAN3 +#ifndef 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; -#ifdef SYMBIAN_VERSION_SYMBIAN3 +#ifndef SYMBIAN_VERSION_9_4 if (softKeyCommandActions.contains(action)) command = softKeyCommandActions.value(action); #endif |