Commit 750f5452 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against Kf5 5.70

parent c04da99a
......@@ -203,10 +203,8 @@
#include <kio_version.h>
#if KIO_VERSION >= QT_VERSION_CHECK(5, 70, 0)
#include <KDialogJobUiDelegate>
#include <KIO/CommandLauncherJob>
#endif
using Sonnet::DictionaryComboBox;
using MailTransport::TransportManager;
......@@ -1995,14 +1993,10 @@ void KMComposerWin::addAttach(KMime::Content *msgPart)
void KMComposerWin::slotAddressBook()
{
#if KIO_VERSION < QT_VERSION_CHECK(5, 70, 0)
KRun::runCommand(QStringLiteral("kaddressbook"), this);
#else
KIO::CommandLauncherJob *job = new KIO::CommandLauncherJob(QStringLiteral("kaddressbook"), {}, this);
job->setDesktopName(QStringLiteral("org.kde.kaddressbook"));
job->setUiDelegate(new KDialogJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, this));
job->start();
#endif
}
void KMComposerWin::slotInsertFile()
......
......@@ -30,10 +30,8 @@
#include <MailCommon/FilterManager>
#include <kio_version.h>
#if KIO_VERSION >= QT_VERSION_CHECK(5, 70, 0)
#include <KDialogJobUiDelegate>
#include <KIO/CommandLauncherJob>
#endif
#include <QProcess>
#include "kmail_debug.h"
......@@ -110,14 +108,10 @@ void KMLaunchExternalComponent::slotExportData()
void KMLaunchExternalComponent::slotRunAddressBook()
{
#if KIO_VERSION < QT_VERSION_CHECK(5, 70, 0)
KRun::runCommand(QStringLiteral("kaddressbook"), mParentWidget->window());
#else
KIO::CommandLauncherJob *job = new KIO::CommandLauncherJob(QStringLiteral("kaddressbook"), {}, this);
job->setDesktopName(QStringLiteral("org.kde.kaddressbook"));
job->setUiDelegate(new KDialogJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled, mParentWidget->window()));
job->start();
#endif
}
void KMLaunchExternalComponent::slotImport()
......
Markdown is supported
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