summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-03-24 21:39:41 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-03-24 21:39:41 (GMT)
commit1e4402497124f7e2c51793a58f03c2b98512f256 (patch)
treeae8661247b40f4bdfd7958c5535abf0de3fe4f75 /src/gui/kernel
parent4710365249f35556d27e49b56be7fb4a667a096a (diff)
parentdb3c3ca5d4b746bedbc129b647a700df94562192 (diff)
downloadQt-1e4402497124f7e2c51793a58f03c2b98512f256.zip
Qt-1e4402497124f7e2c51793a58f03c2b98512f256.tar.gz
Qt-1e4402497124f7e2c51793a58f03c2b98512f256.tar.bz2
Merge branch '4.5' of git@scm.dev.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qevent.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index 3f1df5e..8c7e47d 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -1656,7 +1656,7 @@ Qt::ButtonState QContextMenuEvent::state() const
The variant contains a QLocale object specifying the language of a
certain part of the preedit string. There should be at most one
language set for every part of the preedit string. If several are
- specified for any character in the string the behaviour is undefined.
+ specified for any character in the string the behavior is undefined.
\value Ruby
The ruby text for a part of the preedit string. There should be at