diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-03-25 13:38:54 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-03-25 13:38:54 (GMT) |
commit | e0bd0b685c913e6bf1b1f46ed28fc233aa5694ac (patch) | |
tree | a67834b5030461f149d4a1e47736b0d4cf07042e /src/gui/kernel/qevent.cpp | |
parent | 761cac16eb0a6d32f9e7d558867c5c1bbfb244f9 (diff) | |
parent | 9b40f0275043566a6e1f1471e1f608dd66929b81 (diff) | |
download | Qt-e0bd0b685c913e6bf1b1f46ed28fc233aa5694ac.zip Qt-e0bd0b685c913e6bf1b1f46ed28fc233aa5694ac.tar.gz Qt-e0bd0b685c913e6bf1b1f46ed28fc233aa5694ac.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch
Diffstat (limited to 'src/gui/kernel/qevent.cpp')
-rw-r--r-- | src/gui/kernel/qevent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index ff69c24..d571212 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 |