summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2010-01-21 09:34:12 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2010-01-21 09:34:12 (GMT)
commit7a331f4b08861f80530c3f16532a211b47380f94 (patch)
tree30591808008b7c87a834a25f7a3f6d09d9d7dcd0 /src/corelib
parent848ae6da25e567e9f64bc98dcbf868912448d136 (diff)
parent5c0d077659e8cb2b78dd96f8c629d8512c583d13 (diff)
downloadQt-7a331f4b08861f80530c3f16532a211b47380f94.zip
Qt-7a331f4b08861f80530c3f16532a211b47380f94.tar.gz
Qt-7a331f4b08861f80530c3f16532a211b47380f94.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qcoreevent.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp
index 1b167e2..3f69b4f 100644
--- a/src/corelib/kernel/qcoreevent.cpp
+++ b/src/corelib/kernel/qcoreevent.cpp
@@ -107,13 +107,13 @@ QT_BEGIN_NAMESPACE
\value ApplicationLayoutDirectionChange The default application layout direction has changed.
\value ApplicationPaletteChange The default application palette has changed.
\value ApplicationWindowIconChange The application's icon has changed.
- \value CloseSoftwareInputPanel A widget wants to close the software input panel (SIP).
\value ChildAdded An object gets a child (QChildEvent).
\value ChildInserted An object gets a child (QChildEvent). Qt3Support only, use ChildAdded instead.
\value ChildPolished A widget child gets polished (QChildEvent).
\value ChildRemoved An object loses a child (QChildEvent).
\value Clipboard The clipboard contents have changed (QClipboardEvent).
\value Close Widget was closed (QCloseEvent).
+ \value CloseSoftwareInputPanel A widget wants to close the software input panel (SIP).
\value ContentsRectChange The margins of the widget's content rect changed.
\value ContextMenu Context popup menu (QContextMenuEvent).
\value CursorChange The widget's cursor has changed.