From 9a189a096f134e80e0c11523db14c8580275b4ad Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 24 Jul 2020 11:45:50 +0200 Subject: Remove non-Qt6 compile time switches from QtCore We already manage to compile without this code, and none of it are full classes or separate functions suitable for qt5compat. Change-Id: I47facac7ec621cfc4b0b26214b7de37897443519 Reviewed-by: Friedemann Kleint --- src/corelib/kernel/qabstracteventdispatcher.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/corelib/kernel/qabstracteventdispatcher.cpp') diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index b2bc199c8c..e77e8d3865 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -477,11 +477,7 @@ void QAbstractEventDispatcher::removeNativeEventFilter(QAbstractNativeEventFilte \sa installNativeEventFilter(), QAbstractNativeEventFilter::nativeEventFilter() \since 5.0 */ -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool QAbstractEventDispatcher::filterNativeEvent(const QByteArray &eventType, void *message, qintptr *result) -#else -bool QAbstractEventDispatcher::filterNativeEvent(const QByteArray &eventType, void *message, long *result) -#endif { Q_D(QAbstractEventDispatcher); if (!d->eventFilters.isEmpty()) { -- cgit v1.2.3