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/io/qfilesystemwatcher_win.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/corelib/io') diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp index 9544dd7a04..482360658f 100644 --- a/src/corelib/io/qfilesystemwatcher_win.cpp +++ b/src/corelib/io/qfilesystemwatcher_win.cpp @@ -107,11 +107,7 @@ public: // Call from QFileSystemWatcher::addPaths() to set up notifications on drives void addPath(const QString &path); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool nativeEventFilter(const QByteArray &, void *messageIn, qintptr *) override; -#else - bool nativeEventFilter(const QByteArray &, void *messageIn, long *) override; -#endif signals: void driveAdded(); @@ -258,11 +254,7 @@ inline void QWindowsRemovableDriveListener::handleDbtDriveArrivalRemoval(const M } } -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) bool QWindowsRemovableDriveListener::nativeEventFilter(const QByteArray &, void *messageIn, qintptr *) -#else -bool QWindowsRemovableDriveListener::nativeEventFilter(const QByteArray &, void *messageIn, long *) -#endif { const MSG *msg = reinterpret_cast(messageIn); if (msg->message == WM_DEVICECHANGE) { -- cgit v1.2.3