diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-04 12:45:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-04 12:45:27 (GMT) |
| commit | 22f285ac93bde36d0d965f72cd56b6173e88c6e2 (patch) | |
| tree | 41fa12b2b3bc85307b31a168fd1a0b47f6e8713d /src/gui/kernel | |
| parent | 7418c05b7534b1e3aa014b420081d2f94b1ac0d2 (diff) | |
| parent | eb20a7341827b5590fbd891ca1b82ea7ba37d679 (diff) | |
| download | Qt-22f285ac93bde36d0d965f72cd56b6173e88c6e2.zip Qt-22f285ac93bde36d0d965f72cd56b6173e88c6e2.tar.gz Qt-22f285ac93bde36d0d965f72cd56b6173e88c6e2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QGradient stop with NaN position on Symbian.
Do not add project path to SYMBIAN_MATCHED_TRANSLATIONS if not needed
QApplication does not define flag for "single touch"
Native dialog softkeys are covered by QApplication softkeys
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qapplication_s60.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index 1856ead..21b50b6 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -2198,7 +2198,8 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent } #endif #ifdef QT_SOFTKEYS_ENABLED - QSoftKeyManager::updateSoftKeys(); + if (!CEikonEnv::Static()->EikAppUi()->IsDisplayingMenuOrDialog()) + QSoftKeyManager::updateSoftKeys(); #endif break; case EEventFocusLost: |