diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-15 15:54:27 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-15 15:54:27 (GMT) |
| commit | 88fa17f5664e3839ffc04db1315e8d9d07f8b956 (patch) | |
| tree | 65c63c815a169ffcb02fa3a3bdb63d2e2d9ba4cb /src/gui/widgets | |
| parent | 8d7046fbd798c6104eca6098b828c505ca32085c (diff) | |
| parent | 925c41f2a1c38d958de3844785bcc8c83ff74004 (diff) | |
| download | Qt-88fa17f5664e3839ffc04db1315e8d9d07f8b956.zip Qt-88fa17f5664e3839ffc04db1315e8d9d07f8b956.tar.gz Qt-88fa17f5664e3839ffc04db1315e8d9d07f8b956.tar.bz2 | |
Merge branch 'qt-graphics-team-qstatictext-4.7'
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qlinecontrol.cpp | 2 |
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 |