diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-08-06 01:19:16 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-08-06 01:19:16 (GMT) |
| commit | 64031a8a69d5f71d73208447e0b1f7108aabd2fc (patch) | |
| tree | c3fcee1fb2e86e0d6f06e7f694ba4a8a8aeddc21 /src/gui/widgets/qlineedit.cpp | |
| parent | 8f839bb7b18e9140af7842daa142b0224d8680d7 (diff) | |
| download | Qt-64031a8a69d5f71d73208447e0b1f7108aabd2fc.zip Qt-64031a8a69d5f71d73208447e0b1f7108aabd2fc.tar.gz Qt-64031a8a69d5f71d73208447e0b1f7108aabd2fc.tar.bz2 | |
Compile Fix for QT_KEYPAD_NAVIGATION
Diffstat (limited to 'src/gui/widgets/qlineedit.cpp')
| -rw-r--r-- | src/gui/widgets/qlineedit.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index e0f5bc9..9f315fd 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -1669,7 +1669,7 @@ void QLineEdit::focusInEvent(QFocusEvent *e) selectAll(); } #ifdef QT_KEYPAD_NAVIGATION - if (!QApplication::keypadNavigationEnabled() || (hasEditFocus() && e->reason() == Qt::PopupFocusReason)) + if (!QApplication::keypadNavigationEnabled() || (hasEditFocus() && e->reason() == Qt::PopupFocusReason)){ #endif int cft = QApplication::cursorFlashTime(); d->control->setCursorBlinkPeriod(cft/2); @@ -1683,7 +1683,8 @@ void QLineEdit::focusInEvent(QFocusEvent *e) qt_mac_secure_keyboard(true); #endif #ifdef QT_KEYPAD_NAVIGATION - d->control->setCancelText(d->text); + d->control->setCancelText(d->control->text()); + } #endif #ifndef QT_NO_COMPLETER if (d->control->completer()) { |