diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-24 11:45:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-24 13:10:57 +0200 |
| commit | 9a189a096f134e80e0c11523db14c8580275b4ad (patch) | |
| tree | 154a408d7607a9aa9cf10f66ed552dfbcfe18292 /src/corelib/kernel/qabstracteventdispatcher.h | |
| parent | 999f62531a784b8f0f1f6d3cb7aaaa5455485d17 (diff) | |
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 <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/kernel/qabstracteventdispatcher.h')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index 1268b2e04e..e3bc94a762 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -104,11 +104,7 @@ public: void installNativeEventFilter(QAbstractNativeEventFilter *filterObj); void removeNativeEventFilter(QAbstractNativeEventFilter *filterObj); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool filterNativeEvent(const QByteArray &eventType, void *message, qintptr *result); -#else - bool filterNativeEvent(const QByteArray &eventType, void *message, long *result); -#endif Q_SIGNALS: void aboutToBlock(); @@ -119,7 +115,7 @@ protected: QObject *parent); }; -Q_DECLARE_TYPEINFO(QAbstractEventDispatcher::TimerInfo, (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ? Q_PRIMITIVE_TYPE : Q_RELOCATABLE_TYPE)); +Q_DECLARE_TYPEINFO(QAbstractEventDispatcher::TimerInfo, Q_PRIMITIVE_TYPE); QT_END_NAMESPACE |