diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
| commit | 30fd22b9574def54726e7b193127cc0c901c1b4c (patch) | |
| tree | 96dfc923044db0515064ba39d052d9ed577e3e40 /src/corelib/kernel/qabstracteventdispatcher.cpp | |
| parent | d7b0581c1c2ef60c08d238dae39298af6904918f (diff) | |
| parent | 6aa09bbce59828d028f6d1e81d2bfc6ba537aae1 (diff) | |
Merge remote-tracking branch 'origin/dev' into stable
Change-Id: Ice524edcc51373509f0023ae7f7c2963f4602f88
Diffstat (limited to 'src/corelib/kernel/qabstracteventdispatcher.cpp')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index 54524fa55b..90e3a1e9e1 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -210,9 +210,11 @@ QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread) */ /*! \fn bool QAbstractEventDispatcher::hasPendingEvents() + \deprecated - Returns \c true if there is an event waiting; otherwise returns - false. + Returns \c true if there is an event waiting; otherwise returns false. This + function is an implementation detail for + QCoreApplication::hasPendingEvents() and must not be called directly. */ /*! |