Remove Qt6 ifdef switches from plugins

Removing dead code

Change-Id: I368fcec95d230e1face18062ff19704608354654
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp

@@ -297,11 +297,7 @@ void QQnxScreenEventHandler::processEvents()
             break;
 
         ++count;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
         qintptr result = 0;
-#else
-        long result = 0;
-#endif
         QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance();
         bool handled = dispatcher && dispatcher->filterNativeEvent(QByteArrayLiteral("screen_event_t"), event, &result);
         if (!handled)

src/plugins/platforms/wasm/qwasmeventtranslator.cpp

@@ -330,16 +330,10 @@ QWasmEventTranslator::QWasmEventTranslator(QWasmScreen *screen)
     , pressedButtons(Qt::NoButton)
     , resizeMode(QWasmWindow::ResizeNone)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     touchDevice = new QPointingDevice("touchscreen", 1, QInputDevice::DeviceType::TouchScreen,
     QPointingDevice::PointerType::Finger,
     QPointingDevice::Capability::Position | QPointingDevice::Capability::Area | QPointingDevice::Capability::NormalizedPosition,
     10, 0);
-#else
-    touchDevice = new QPointingDevice;
-    touchDevice->setType(QInputDevice::DeviceType::TouchScreen);
-    touchDevice->setCapabilities(QPointingDevice::Capability::Position | QPointingDevice::Capability::Area | QPointingDevice::Capability::NormalizedPosition);
-#endif
     QWindowSystemInterface::registerInputDevice(touchDevice);
 
     initEventHandlers();

src/plugins/platforms/wasm/qwasmeventtranslator.h

@@ -35,11 +35,7 @@
 #include <QtCore/qpoint.h>
 #include <emscripten/html5.h>
 #include "qwasmwindow.h"
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 #include <QtGui/qinputdevice.h>
-#else
-#include <QtGui/qpointingdevice.h>
-#endif
 #include <QHash>
 #include <QCursor>
 

src/plugins/platforms/windows/qwindowscontext.cpp

@@ -1750,11 +1750,7 @@ static inline QByteArray nativeEventType() { return QByteArrayLiteral("windows_g
 bool QWindowsContext::filterNativeEvent(MSG *msg, LRESULT *result)
 {
     QAbstractEventDispatcher *dispatcher = QAbstractEventDispatcher::instance();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     qintptr filterResult = 0;
-#else
-    long filterResult = 0;
-#endif
     if (dispatcher && dispatcher->filterNativeEvent(nativeEventType(), msg, &filterResult)) {
         *result = LRESULT(filterResult);
         return true;
@@ -1765,11 +1761,7 @@ bool QWindowsContext::filterNativeEvent(MSG *msg, LRESULT *result)
 // Send to QWindowSystemInterface
 bool QWindowsContext::filterNativeEvent(QWindow *window, MSG *msg, LRESULT *result)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     qintptr filterResult = 0;
-#else
-    long filterResult = 0;
-#endif
     if (QWindowSystemInterface::handleNativeEvent(window, nativeEventType(), msg, &filterResult)) {
         *result = LRESULT(filterResult);
         return true;

src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp

@@ -171,11 +171,7 @@ bool QXcbGlxIntegration::handleXcbEvent(xcb_generic_event_t *event, uint respons
                 XUnlockDisplay(xdisplay);
                 locked = false;
                 auto eventType = m_connection->nativeInterface()->nativeEventType();
-#  if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
                 qintptr result = 0;
-#  else
-                long result = 0;
-#  endif
                 handled = dispatcher->filterNativeEvent(eventType, &ev, &result);
             }
 #endif

src/plugins/platforms/xcb/qxcbconnection.cpp

@@ -471,11 +471,7 @@ const char *xcb_protocol_request_codes[] =
 
 void QXcbConnection::handleXcbError(xcb_generic_error_t *error)
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     qintptr result = 0;
-#else
-    long result = 0;
-#endif
     QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance();
     if (dispatcher && dispatcher->filterNativeEvent(m_nativeInterface->nativeEventType(), error, &result))
         return;
@@ -570,11 +566,7 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event)
     if (Q_UNLIKELY(lcQpaEvents().isDebugEnabled()))
         printXcbEvent(lcQpaEvents(), "Event", event);
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     qintptr result = 0; // Used only by MS Windows
-#else
-    long result = 0; // Used only by MS Windows
-#endif
     if (QAbstractEventDispatcher *dispatcher = QAbstractEventDispatcher::instance()) {
         if (dispatcher->filterNativeEvent(m_nativeInterface->nativeEventType(), event, &result))
             return;

src/plugins/platforms/xcb/qxcbwindow.cpp

@@ -1620,11 +1620,7 @@ bool QXcbWindow::requestSystemTrayWindowDock()
 bool QXcbWindow::handleNativeEvent(xcb_generic_event_t *event)
 {
     auto eventType = connection()->nativeInterface()->nativeEventType();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     qintptr result = 0; // Used only by MS Windows
-#else
-    long result = 0; // Used only by MS Windows
-#endif
     return QWindowSystemInterface::handleNativeEvent(window(), eventType, event, &result);
 }