summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-20 20:35:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-20 20:35:02 (GMT)
commit15bf93ba9acf7dceef2a2b16d4664b172d264086 (patch)
tree95cdcba70330c07a258071781b566c9a7726450a /src/corelib
parent185388c0bf0f258d070376a2a3e50b9e89e1a249 (diff)
parentcd5e75810d59ab6e92c88189015aee77448160e4 (diff)
downloadQt-15bf93ba9acf7dceef2a2b16d4664b172d264086.zip
Qt-15bf93ba9acf7dceef2a2b16d4664b172d264086.tar.gz
Qt-15bf93ba9acf7dceef2a2b16d4664b172d264086.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: 1st attempt at USB serial port enumerator for linux Corrected alphabetic order in the docs for events. Implemented event filter functions for Symbian.
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.