diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,7 +91,6 @@ KF5::WidgetsAddons KF5::KIOWidgets KF5::ConfigWidgets - KF5::IconThemes Grantlee5::TextDocument KF5::XmlGui KF5::I18n diff --git a/src/texteditor/commonwidget/textmessageindicator.cpp b/src/texteditor/commonwidget/textmessageindicator.cpp --- a/src/texteditor/commonwidget/textmessageindicator.cpp +++ b/src/texteditor/commonwidget/textmessageindicator.cpp @@ -19,13 +19,12 @@ #include "textmessageindicator.h" -#include - #include #include #include #include #include +#include using namespace KPIMTextEdit; TextMessageIndicator::TextMessageIndicator(QWidget *parent) @@ -56,16 +55,17 @@ mLineSpacing = 0; // load icon (if set) mSymbol = QPixmap(); + const auto iconSize = style()->pixelMetric(QStyle::PM_SmallIconSize); if (icon != None) { switch (icon) { case Error: - mSymbol = SmallIcon(QStringLiteral("dialog-error")); + mSymbol = QIcon::fromTheme(QStringLiteral("dialog-error")).pixmap(iconSize); break; case Warning: - mSymbol = SmallIcon(QStringLiteral("dialog-warning")); + mSymbol = QIcon::fromTheme(QStringLiteral("dialog-warning")).pixmap(iconSize); break; default: - mSymbol = SmallIcon(QStringLiteral("dialog-information")); + mSymbol = QIcon::fromTheme(QStringLiteral("dialog-information")).pixmap(iconSize); break; } } diff --git a/src/texteditor/plaintexteditor/plaintexteditor.cpp b/src/texteditor/plaintexteditor/plaintexteditor.cpp --- a/src/texteditor/plaintexteditor/plaintexteditor.cpp +++ b/src/texteditor/plaintexteditor/plaintexteditor.cpp @@ -22,7 +22,6 @@ #include "texteditor/commonwidget/textmessageindicator.h" #include #include -#include #include #include #include @@ -139,9 +138,6 @@ } } } - KIconTheme::assignIconsToContextMenu(isReadOnly() ? KIconTheme::ReadOnlyText - : KIconTheme::TextEditor, - popup->actions()); if (d->supportFeatures & Search) { popup->addSeparator(); if (!emptyDocument) { diff --git a/src/texteditor/richtexteditor/richtexteditor.cpp b/src/texteditor/richtexteditor/richtexteditor.cpp --- a/src/texteditor/richtexteditor/richtexteditor.cpp +++ b/src/texteditor/richtexteditor/richtexteditor.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -172,9 +171,6 @@ popup->insertAction(separatorAction, clearAllAction); } } - KIconTheme::assignIconsToContextMenu(isReadOnly() ? KIconTheme::ReadOnlyText - : KIconTheme::TextEditor, - popup->actions()); if (searchSupport()) { popup->addSeparator(); QAction *findAct = popup->addAction(KStandardGuiItem::find().icon(), KStandardGuiItem::find().text(), this, &RichTextEditor::findText, Qt::Key_F + Qt::CTRL);