diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:01:25 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:02:41 +0100 |
| commit | 79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch) | |
| tree | 8336143e8c09810dc97324970fed61af27e26a97 /src/corelib/kernel/qabstracteventdispatcher.cpp | |
| parent | 7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff) | |
| parent | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff) | |
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qvariant.cpp
src/tools/moc/moc.h
Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'src/corelib/kernel/qabstracteventdispatcher.cpp')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index 3075eab753..b98f3f4a30 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -167,7 +167,7 @@ QAbstractEventDispatcher::~QAbstractEventDispatcher() event dispatcher exists for the specified thread, this function returns 0. - \bold{Note:} If Qt is built without thread support, the \a thread + \b{Note:} If Qt is built without thread support, the \a thread argument is ignored. */ QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread) @@ -192,10 +192,10 @@ QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread) \list - \i If events are available, this function returns after processing + \li If events are available, this function returns after processing them. - \i If no events are available, this function will wait until more + \li If no events are available, this function will wait until more are available and return after processing newly available events. \endlist @@ -204,7 +204,7 @@ QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread) and no events are available, this function will return immediately. - \bold{Note:} This function does not process events continuously; it + \b{Note:} This function does not process events continuously; it returns after all available events are processed. \sa hasPendingEvents() @@ -349,17 +349,17 @@ void QAbstractEventDispatcher::closingDown() \table \header - \o Platform - \o type + \li Platform + \li type \row - \o Windows - \o MSG + \li Windows + \li MSG \row - \o X11 - \o XEvent + \li X11 + \li XEvent \row - \o Mac - \o NSEvent + \li Mac + \li NSEvent \endtable |