diff --git a/core/backends/lan/lanlinkprovider.h b/core/backends/lan/lanlinkprovider.h index 08b3b07bc..53522dafa 100644 --- a/core/backends/lan/lanlinkprovider.h +++ b/core/backends/lan/lanlinkprovider.h @@ -7,17 +7,12 @@ #ifndef LANLINKPROVIDER_H #define LANLINKPROVIDER_H +#include #include #include #include #include #include -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#include -#include -#else -#include -#endif #include "backends/linkprovider.h" #include "kdeconnectcore_export.h" diff --git a/kcm/kcm.h b/kcm/kcm.h index 6e19b0895..7716a8255 100644 --- a/kcm/kcm.h +++ b/kcm/kcm.h @@ -26,13 +26,6 @@ public: KdeConnectKcm(QObject *parent, const QVariantList &); ~KdeConnectKcm() override; -#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 105, 0) - QWidget *widget() - { - return this; - } -#endif - private: void save() override; diff --git a/kcmplugin/kdeconnectpluginkcm.h b/kcmplugin/kdeconnectpluginkcm.h index 2559a61a1..6f6bb1120 100644 --- a/kcmplugin/kdeconnectpluginkcm.h +++ b/kcmplugin/kdeconnectpluginkcm.h @@ -40,13 +40,6 @@ public: return m_config; } -#if KCONFIGWIDGETS_VERSION < QT_VERSION_CHECK(5, 105, 0) - QWidget *widget() - { - return this; - } -#endif - private: const QString m_deviceId; const QString m_pluginName; diff --git a/plugins/mousepad/x11remoteinput.cpp b/plugins/mousepad/x11remoteinput.cpp index 75138e0ff..9532dca37 100644 --- a/plugins/mousepad/x11remoteinput.cpp +++ b/plugins/mousepad/x11remoteinput.cpp @@ -9,11 +9,7 @@ #include #include -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#include -#else #include -#endif #include #include diff --git a/plugins/notifications/notificationsplugin.cpp b/plugins/notifications/notificationsplugin.cpp index 07f0d6d94..c52556d87 100644 --- a/plugins/notifications/notificationsplugin.cpp +++ b/plugins/notifications/notificationsplugin.cpp @@ -13,12 +13,8 @@ #include #if !defined(Q_OS_WIN) && !defined(Q_OS_MAC) #include -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -#include -#else #include #endif -#endif K_PLUGIN_CLASS_WITH_JSON(NotificationsPlugin, "kdeconnect_notifications.json") diff --git a/plugins/sendnotifications/notificationslistener.cpp b/plugins/sendnotifications/notificationslistener.cpp index e873c170f..2306a14d1 100644 --- a/plugins/sendnotifications/notificationslistener.cpp +++ b/plugins/sendnotifications/notificationslistener.cpp @@ -22,10 +22,6 @@ NotificationsListener::NotificationsListener(KdeConnectPlugin *aPlugin) : QObject(aPlugin) , m_plugin(aPlugin) { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - qRegisterMetaTypeStreamOperators("NotifyingApplication"); -#endif - setTranslatedAppName(); loadApplications(); diff --git a/plugins/sendnotifications/sendnotifications_config.cpp b/plugins/sendnotifications/sendnotifications_config.cpp index f4573e01c..4a7c14592 100644 --- a/plugins/sendnotifications/sendnotifications_config.cpp +++ b/plugins/sendnotifications/sendnotifications_config.cpp @@ -16,10 +16,6 @@ SendNotificationsConfig::SendNotificationsConfig(QObject *parent, const KPluginM : KdeConnectPluginKcm(parent, data, args) , appModel(new NotifyingApplicationModel) { -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - qRegisterMetaTypeStreamOperators("NotifyingApplication"); -#endif - m_ui.setupUi(widget()); m_ui.appList->setIconSize(QSize(32, 32));