diff options
| author | axis <qt-info@nokia.com> | 2009-11-16 15:53:28 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-16 15:53:28 (GMT) |
| commit | 54132fc20df0c3362c96a974654e1bd88b0eb121 (patch) | |
| tree | a7b206399c98a2231b38cbadd8ea6a7faed26273 | |
| parent | dc2cb80ceb35edd958685189e9075ac1061870f4 (diff) | |
| parent | c859454d5b163edb15fd2dcab89ecfaacbd49aa6 (diff) | |
| download | Qt-54132fc20df0c3362c96a974654e1bd88b0eb121.zip Qt-54132fc20df0c3362c96a974654e1bd88b0eb121.tar.gz Qt-54132fc20df0c3362c96a974654e1bd88b0eb121.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-staging2
| -rw-r--r-- | src/gui/widgets/qlineedit.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/qplaintextedit.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/qtextedit.cpp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index 9372ddd..9f3fe4f 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -1515,7 +1515,8 @@ void QLineEdit::mouseReleaseEvent(QMouseEvent* e) } #endif - d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus); + if (!isReadOnly()) + d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus); d->clickCausedFocus = 0; } diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp index 18adc6c..c7759e8 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -1966,7 +1966,8 @@ void QPlainTextEdit::mouseReleaseEvent(QMouseEvent *e) d->ensureCursorVisible(); } - d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus); + if (!isReadOnly()) + d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus); d->clickCausedFocus = 0; } diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp index 14de719..3a4d77d 100644 --- a/src/gui/widgets/qtextedit.cpp +++ b/src/gui/widgets/qtextedit.cpp @@ -1576,7 +1576,8 @@ void QTextEdit::mouseReleaseEvent(QMouseEvent *e) d->autoScrollTimer.stop(); ensureCursorVisible(); } - d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus); + if (!isReadOnly()) + d->handleSoftwareInputPanel(e->button(), d->clickCausedFocus); d->clickCausedFocus = 0; } |