diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-21 13:00:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-21 13:00:50 (GMT) |
| commit | beb16e0d8b3b81a67170c578a72d3816b87569cc (patch) | |
| tree | 58610478853ebd85226469117dc608a64116c7de /src/gui/widgets/qlineedit.cpp | |
| parent | 69e848ff4a8dad648f706a34b106b8a84155c875 (diff) | |
| parent | 71ee64f5a44dc310272b14fe6cd913b2e75672ed (diff) | |
| download | Qt-beb16e0d8b3b81a67170c578a72d3816b87569cc.zip Qt-beb16e0d8b3b81a67170c578a72d3816b87569cc.tar.gz Qt-beb16e0d8b3b81a67170c578a72d3816b87569cc.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Edit focus should not be lost unless by explicit action
RVCT 2.2 compiler can't handle static inline functions with templates.
Forwarded return value from QtMainWrapper() to E32Main() exit code.
Diffstat (limited to 'src/gui/widgets/qlineedit.cpp')
| -rw-r--r-- | src/gui/widgets/qlineedit.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index 15dcda2..573b2b5 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -1761,7 +1761,11 @@ void QLineEdit::focusInEvent(QFocusEvent *e) d->clickCausedFocus = 1; } #ifdef QT_KEYPAD_NAVIGATION - if (!QApplication::keypadNavigationEnabled() || (hasEditFocus() && e->reason() == Qt::PopupFocusReason)){ + if (!QApplication::keypadNavigationEnabled() || (hasEditFocus() && ( e->reason() == Qt::PopupFocusReason +#ifdef Q_OS_SYMBIAN + || e->reason() == Qt::ActiveWindowFocusReason +#endif + ))) { #endif d->control->setCursorBlinkPeriod(QApplication::cursorFlashTime()); QStyleOptionFrameV2 opt; |