diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:28:12 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-27 18:28:12 +0100 |
| commit | ce6990c3e742e0833df0561246554cf07a888efb (patch) | |
| tree | 412380582040f5bb314eb90ae029b41a883aa439 /src/corelib/kernel | |
| parent | 09e674849a40f5eb7e9f95fd2a952c621aec86d1 (diff) | |
| parent | fa9bde7d3a12ede956339c570f7b32f95d231e57 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Id20053d261b4fbbcc0ac8ba49dd3ef2253fa4b95
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 77900ba906..ca3d92bad1 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2580,6 +2580,7 @@ void QCoreApplication::removeNativeEventFilter(QAbstractNativeEventFilter *filte \sa QAbstractEventDispatcher::hasPendingEvents() */ +#if QT_DEPRECATED_SINCE(5, 3) bool QCoreApplication::hasPendingEvents() { QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(); @@ -2587,6 +2588,7 @@ bool QCoreApplication::hasPendingEvents() return eventDispatcher->hasPendingEvents(); return false; } +#endif /*! Returns a pointer to the event dispatcher object for the main thread. If no |