summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-29 13:33:27 +0200
committerMontel Laurent <[email protected]>2017-06-29 14:07:15 +0200
commit112df162f1cad84300ce58381cab94a0301743b7 (patch)
tree84a03469990280eb1f8838d77b0506097a045065
parente15b6524f733d1b7c18bf2e08ff6dac2095c530c (diff)
Compile widget
-rw-r--r--kmailtransport/sendmail/CMakeLists.txt19
-rw-r--r--kmailtransport/sendmail/sendmailconfigwidget.cpp6
-rw-r--r--kmailtransport/sendmail/sendmailconfigwidget.h2
3 files changed, 18 insertions, 9 deletions
diff --git a/kmailtransport/sendmail/CMakeLists.txt b/kmailtransport/sendmail/CMakeLists.txt
index 9f73eb7..6420ec9 100644
--- a/kmailtransport/sendmail/CMakeLists.txt
+++ b/kmailtransport/sendmail/CMakeLists.txt
@@ -1,11 +1,20 @@
set(mailtransport_sendplugin_SRCS
- sendmailtransportplugin.cpp
- sendmailjob.cpp
-)
+ sendmailtransportplugin.cpp
+ sendmailjob.cpp
+ sendmailconfigwidget.cpp
+ )
+
+ki18n_wrap_ui(mailtransport_sendplugin_SRCS
+ sendmailsettings.ui
+ )
kcoreaddons_add_plugin(mailtransport_sendplugin JSON sendmailtransport.json SOURCES
${mailtransport_sendplugin_SRCS} INSTALL_NAMESPACE mailtransport)
target_link_libraries(mailtransport_sendplugin
- KF5::MailTransport KF5::CoreAddons KF5::I18n KF5::ConfigWidgets
-)
+ KF5::MailTransport
+ KF5::CoreAddons
+ KF5::I18n
+ KF5::ConfigWidgets
+ KF5::KIOWidgets
+ )
diff --git a/kmailtransport/sendmail/sendmailconfigwidget.cpp b/kmailtransport/sendmail/sendmailconfigwidget.cpp
index b17f47f..2d76b26 100644
--- a/kmailtransport/sendmail/sendmailconfigwidget.cpp
+++ b/kmailtransport/sendmail/sendmailconfigwidget.cpp
@@ -26,10 +26,10 @@
*/
#include "sendmailconfigwidget.h"
-#include "transportconfigwidget_p.h"
+#include "mailtransport/private/transportconfigwidget_p.h"
#include "ui_sendmailsettings.h"
-#include <KStandardDirs>
+#include <QStandardPaths>
#include <KLineEdit>
using namespace MailTransport;
@@ -66,7 +66,7 @@ void SendmailConfigWidget::init()
// Locate sendmail.
// This is imperfect, because it shows the standard path if an empty path
// is saved in the config.
- d->ui.kcfg_host->setText(KStandardDirs::findExe(QLatin1String("sendmail")));
+ d->ui.kcfg_host->setText(QStandardPaths::findExecutable(QStringLiteral("sendmail")));
}
connect(d->ui.kcfg_host->lineEdit(), SIGNAL(textChanged(QString)),
SLOT(slotTextChanged(QString)));
diff --git a/kmailtransport/sendmail/sendmailconfigwidget.h b/kmailtransport/sendmail/sendmailconfigwidget.h
index f48cfb2..5f10cd3 100644
--- a/kmailtransport/sendmail/sendmailconfigwidget.h
+++ b/kmailtransport/sendmail/sendmailconfigwidget.h
@@ -45,7 +45,7 @@ class SendmailConfigWidget : public TransportConfigWidget
Q_OBJECT
public:
- explicit SendmailConfigWidget(Transport *transport, QWidget *parent = 0);
+ explicit SendmailConfigWidget(Transport *transport, QWidget *parent = nullptr);
bool pathIsEmpty() const;
Q_SIGNALS:
void enableButtonOk(bool);