summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-02-08 13:08:29 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-02-08 13:11:31 (GMT)
commit95f8f814f2f77654d846660644f0e8a5c48eeb26 (patch)
tree925f1f41f6e0e86aa16ea48da02909492a36f129 /src
parent466ac1c7d93d3f5dea35f1a6e214907899772ae3 (diff)
downloadQt-95f8f814f2f77654d846660644f0e8a5c48eeb26.zip
Qt-95f8f814f2f77654d846660644f0e8a5c48eeb26.tar.gz
Qt-95f8f814f2f77654d846660644f0e8a5c48eeb26.tar.bz2
QLineEdit: regression: read-only line edits would eat shortcuts.
Restore Qt 4.5 behaviour. Task-number: QTBUG-7395 Reviewed-by: Thierry
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qlinecontrol.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index b0a64ea..db099e8 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -1371,6 +1371,8 @@ bool QLineControl::processEvent(QEvent* ev)
processInputMethodEvent(static_cast<QInputMethodEvent*>(ev)); break;
#ifndef QT_NO_SHORTCUT
case QEvent::ShortcutOverride:{
+ if (isReadOnly())
+ return false;
QKeyEvent* ke = static_cast<QKeyEvent*>(ev);
if (ke == QKeySequence::Copy
|| ke == QKeySequence::Paste