From c22aa8092aa2dfdedc8569ba27764b3681f71665 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Wed, 17 Aug 2022 07:59:46 +0200 Subject: [PATCH] Remove no longer needed ifdefs --- src/helpers/killer/killer.cpp | 7 +------ src/wayland/autotests/client/test_wayland_seat.cpp | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/helpers/killer/killer.cpp b/src/helpers/killer/killer.cpp index 50af5d9c7b..9f1a58d93a 100644 --- a/src/helpers/killer/killer.cpp +++ b/src/helpers/killer/killer.cpp @@ -5,14 +5,9 @@ */ +#include #include #include -#include -#if KAUTH_VERSION >= QT_VERSION_CHECK(5, 92, 0) -#include -#else -#include -#endif #include #include #include diff --git a/src/wayland/autotests/client/test_wayland_seat.cpp b/src/wayland/autotests/client/test_wayland_seat.cpp index 19ed8c2690..7b988be984 100644 --- a/src/wayland/autotests/client/test_wayland_seat.cpp +++ b/src/wayland/autotests/client/test_wayland_seat.cpp @@ -633,9 +633,6 @@ void TestWaylandSeat::testPointerButton_data() QTest::newRow("left") << Qt::LeftButton << quint32(BTN_LEFT); QTest::newRow("right") << Qt::RightButton << quint32(BTN_RIGHT); // Deprecated in qt5.15 -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QTest::newRow("mid") << Qt::MidButton << quint32(BTN_MIDDLE); -#endif QTest::newRow("middle") << Qt::MiddleButton << quint32(BTN_MIDDLE); QTest::newRow("back") << Qt::BackButton << quint32(BTN_BACK); QTest::newRow("x1") << Qt::XButton1 << quint32(BTN_BACK);