diff --git a/kmail/plugins/CMakeLists.txt b/kmail/plugins/CMakeLists.txt
--- a/kmail/plugins/CMakeLists.txt
+++ b/kmail/plugins/CMakeLists.txt
@@ -7,4 +7,3 @@
#Laurent disable for the moment
#add_subdirectory(mailmergeplugin)
install(FILES common/kmail.antispamrc common/kmail.antivirusrc DESTINATION ${KDE_INSTALL_CONFDIR})
-install(FILES common/pics/kmwizard.png common/pics/kmwizard.svg DESTINATION ${KDE_INSTALL_DATADIR}/kmail2/pics)
diff --git a/kmail/plugins/antispamplugin/CMakeLists.txt b/kmail/plugins/antispamplugin/CMakeLists.txt
--- a/kmail/plugins/antispamplugin/CMakeLists.txt
+++ b/kmail/plugins/antispamplugin/CMakeLists.txt
@@ -2,12 +2,13 @@
antispamplugin.cpp
antispamplugininterface.cpp
../common/antispamwizard.cpp
+ ../common/antispam.qrc
)
kcoreaddons_add_plugin(kmail_antispamplugin JSON kmail_antispamplugin.json SOURCES
${kmail_antispamplugin_SRCS} INSTALL_NAMESPACE kmail)
target_link_libraries(kmail_antispamplugin
- KF5::PimCommonAkonadi KF5::Completion KF5::IconThemes KF5::MailCommon KF5::XmlGui KF5::Libkdepim KF5::I18n
+ KF5::PimCommonAkonadi KF5::Completion KF5::MailCommon KF5::XmlGui KF5::Libkdepim KF5::I18n
)
diff --git a/kmail/plugins/antispamplugin/autotests/CMakeLists.txt b/kmail/plugins/antispamplugin/autotests/CMakeLists.txt
--- a/kmail/plugins/antispamplugin/autotests/CMakeLists.txt
+++ b/kmail/plugins/antispamplugin/autotests/CMakeLists.txt
@@ -5,7 +5,7 @@
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_antispamplugin-${_name})
- target_link_libraries( ${_name} KF5::PimCommon Qt5::Test KF5::XmlGui KF5::Completion KF5::IconThemes KF5::AkonadiWidgets KF5::MailCommon KF5::Libkdepim KF5::I18n)
+ target_link_libraries( ${_name} KF5::PimCommon Qt5::Test KF5::XmlGui KF5::Completion KF5::AkonadiWidgets KF5::MailCommon KF5::Libkdepim KF5::I18n)
endmacro ()
add_kmail_antispamplugin_unittest(antispamplugininterfacetest.cpp "../antispamplugininterface.cpp;../../common/antispamwizard.cpp")
diff --git a/kmail/plugins/antivirusplugin/CMakeLists.txt b/kmail/plugins/antivirusplugin/CMakeLists.txt
--- a/kmail/plugins/antivirusplugin/CMakeLists.txt
+++ b/kmail/plugins/antivirusplugin/CMakeLists.txt
@@ -2,13 +2,14 @@
antivirusplugin.cpp
antivirusplugininterface.cpp
../common/antispamwizard.cpp
+ ../common/antispam.qrc
)
kcoreaddons_add_plugin(kmail_antivirusplugin JSON kmail_antivirusplugin.json SOURCES
${kmail_antivirusplugin_SRCS} INSTALL_NAMESPACE kmail)
target_link_libraries(kmail_antivirusplugin
- KF5::PimCommonAkonadi KF5::Completion KF5::IconThemes KF5::MailCommon KF5::AkonadiWidgets KF5::XmlGui KF5::Libkdepim KF5::I18n
+ KF5::PimCommonAkonadi KF5::Completion KF5::MailCommon KF5::AkonadiWidgets KF5::XmlGui KF5::Libkdepim KF5::I18n
)
if(BUILD_TESTING)
add_subdirectory(autotests)
diff --git a/kmail/plugins/antivirusplugin/autotests/CMakeLists.txt b/kmail/plugins/antivirusplugin/autotests/CMakeLists.txt
--- a/kmail/plugins/antivirusplugin/autotests/CMakeLists.txt
+++ b/kmail/plugins/antivirusplugin/autotests/CMakeLists.txt
@@ -5,7 +5,7 @@
add_test(NAME ${_name} COMMAND ${_name} )
ecm_mark_as_test(kmail_antivirusplugin-${_name})
- target_link_libraries( ${_name} KF5::PimCommon Qt5::Test KF5::XmlGui KF5::Completion KF5::IconThemes KF5::AkonadiWidgets KF5::MailCommon KF5::Libkdepim KF5::I18n)
+ target_link_libraries( ${_name} KF5::PimCommon Qt5::Test KF5::XmlGui KF5::Completion KF5::AkonadiWidgets KF5::MailCommon KF5::Libkdepim KF5::I18n)
endmacro ()
add_kmail_antivirusplugin_unittest(antivirusplugininterfacetest.cpp "../antivirusplugininterface.cpp;../../common/antispamwizard.cpp")
diff --git a/kmail/plugins/common/antispam.qrc b/kmail/plugins/common/antispam.qrc
new file mode 100644
--- /dev/null
+++ b/kmail/plugins/common/antispam.qrc
@@ -0,0 +1,5 @@
+
+
+ pics/kmwizard.png
+
+
diff --git a/kmail/plugins/common/antispamwizard.cpp b/kmail/plugins/common/antispamwizard.cpp
--- a/kmail/plugins/common/antispamwizard.cpp
+++ b/kmail/plugins/common/antispamwizard.cpp
@@ -47,7 +47,6 @@
#include
#include
-#include
#include
#include
#include
@@ -989,15 +988,16 @@
: QWidget(parent)
{
setObjectName(name);
- const QString banner = QStringLiteral("kmwizard.png");
mLayout = new QHBoxLayout(this);
QVBoxLayout *sideLayout = new QVBoxLayout();
mLayout->addItem(sideLayout);
mLayout->addItem(new QSpacerItem(5, 5, QSizePolicy::Minimum, QSizePolicy::Expanding));
+ QPixmap banner;
+ banner.load(QStringLiteral(":/org/kde/kmail/pics/kmwizard.png"));
QLabel *bannerLabel = new QLabel(this);
- bannerLabel->setPixmap(UserIcon(banner));
+ bannerLabel->setPixmap(banner);
bannerLabel->setScaledContents(false);
bannerLabel->setFrameShape(QFrame::StyledPanel);
bannerLabel->setFrameShadow(QFrame::Sunken);