summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorLiang QI <liang.qi@nokia.com>2009-10-22 15:37:25 (GMT)
committerLiang QI <liang.qi@nokia.com>2009-10-22 15:37:25 (GMT)
commit30b66e1b92b54b8f035da3c66ad086340befcf5b (patch)
tree3413efe001e00c8de8c2c646c6bb9f696a5d63ad /src/gui
parentf182dcb82c4b0f4807a99bc8fb05bb6d07d8ddd3 (diff)
downloadQt-30b66e1b92b54b8f035da3c66ad086340befcf5b.zip
Qt-30b66e1b92b54b8f035da3c66ad086340befcf5b.tar.gz
Qt-30b66e1b92b54b8f035da3c66ad086340befcf5b.tar.bz2
QTextEdit: Fix the wrong order for call of Qt::WA_InputMethodEnabled in setReadOnly.
Should set Qt::WA_InputMethodEnabled after set the flags, just because shouldEnableInputMethod() will read the flags. Task-number: QTBUG-4917 Reviewed-by: Shane Kearns
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/qtextedit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qtextedit.cpp b/src/gui/widgets/qtextedit.cpp
index b894aa8..f477fee 100644
--- a/src/gui/widgets/qtextedit.cpp
+++ b/src/gui/widgets/qtextedit.cpp
@@ -2079,8 +2079,8 @@ void QTextEdit::setReadOnly(bool ro)
} else {
flags = Qt::TextEditorInteraction;
}
- setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(this));
d->control->setTextInteractionFlags(flags);
+ setAttribute(Qt::WA_InputMethodEnabled, shouldEnableInputMethod(this));
}
/*!