summaryrefslogtreecommitdiffstats
path: root/src/gui/widgets/qlinecontrol.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-10 11:25:45 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-10 11:25:45 (GMT)
commit03abd6981d4a1aebec3b39f5768be3511ffbf0fb (patch)
tree6eff98b5035c584be7be5520e4953644cf5fdb1f /src/gui/widgets/qlinecontrol.cpp
parentd92f8dd19a2f52771063faf0b926faa22149a206 (diff)
parent37ffa8f59c5dc1f4a1174a07e0a6df6e266d40c0 (diff)
downloadQt-03abd6981d4a1aebec3b39f5768be3511ffbf0fb.zip
Qt-03abd6981d4a1aebec3b39f5768be3511ffbf0fb.tar.gz
Qt-03abd6981d4a1aebec3b39f5768be3511ffbf0fb.tar.bz2
Merge branch '4.6' into qstatictext-4.6
Diffstat (limited to 'src/gui/widgets/qlinecontrol.cpp')
-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