Commit 0c9bdcca authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against 5.84

parent 1fb0c138
Pipeline #73774 failed with stage
in 3 minutes and 10 seconds
......@@ -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>
......
......@@ -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>
......
......@@ -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);
......
......@@ -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>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment