We depend against 5.84

noteshared/src/network/notehostdialog.cpp

@@ -11,13 +11,8 @@
 #include "notesharedglobalconfig.h"
 
 #include <kdnssd_version.h>
-#if KDNSSD_VERSION >= QT_VERSION_CHECK(5, 84, 0)
 #include <KDNSSD/ServiceBrowser>
 #include <KDNSSD/ServiceModel>
-#else
-#include <DNSSD/ServiceBrowser>
-#include <DNSSD/ServiceModel>
-#endif
 #include <KHistoryComboBox>
 #include <KLocalizedString>
 

src/apps/knotesapp.cpp

@@ -43,11 +43,7 @@
 
 #include <KActionCollection>
 #include <kdnssd_version.h>
-#if KDNSSD_VERSION >= QT_VERSION_CHECK(5, 84, 0)
 #include <KDNSSD/PublicService>
-#else
-#include <DNSSD/PublicService>
-#endif
 #include <KGlobalAccel>
 #include <KIconEffect>
 #include <KLocalizedString>

src/configdialog/knoteconfigdialog.cpp

@@ -40,11 +40,7 @@ KNoteConfigDialog::KNoteConfigDialog(const QString &title, QWidget *parent)
     setWindowTitle(title);
     const QVector<KPluginMetaData> availablePlugins = KPluginLoader::findPlugins(QStringLiteral("pim/kcms/knotes"));
     for (const KPluginMetaData &metaData : availablePlugins) {
-#if KCMUTILS_VERSION >= QT_VERSION_CHECK(5, 84, 0)
         addModule(metaData);
-#else
-        addModule(metaData.pluginId());
-#endif
     }
 
     connect(button(QDialogButtonBox::Ok), &QPushButton::clicked, this, &KNoteConfigDialog::slotOk);

src/kontactplugin/knotes_part.cpp

@@ -50,11 +50,7 @@
 #include <KActionCollection>
 #include <KCheckableProxyModel>
 #include <kdnssd_version.h>
-#if KDNSSD_VERSION >= QT_VERSION_CHECK(5, 84, 0)
 #include <KDNSSD/PublicService>
-#else
-#include <DNSSD/PublicService>
-#endif
 #include <KLocalizedString>
 #include <KMessageBox>