Commit fd6642c9 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: Time to increase version

parent edc6cdba
Pipeline #47046 skipped
......@@ -12,7 +12,7 @@ option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
option(MESSAGEVIEWER_EXPERIMENTAL_CONVERSATIONVIEW "Experimental conversationview (in progress)" FALSE)
set(KF5_MIN_VERSION "5.77.0")
set(KF5_MIN_VERSION "5.78.0")
set(MESSAGELIB_LIB_VERSION ${PIM_VERSION})
......
......@@ -9,7 +9,6 @@
*/
#include "viewer_p.h"
#include "viewerpurposemenuwidget.h"
#include <kwidgetsaddons_version.h>
#include "messageviewer_debug.h"
#include "utils/mimetype.h"
......@@ -1566,13 +1565,8 @@ void ViewerPrivate::createActions()
i18n("&Set Encoding"), this);
mSelectEncodingAction->setToolBarMode(KSelectAction::MenuMode);
ac->addAction(QStringLiteral("encoding"), mSelectEncodingAction);
#if KWIDGETSADDONS_VERSION < QT_VERSION_CHECK(5, 78, 0)
connect(mSelectEncodingAction, qOverload<int>(&KSelectAction::triggered),
this, &ViewerPrivate::slotSetEncoding);
#else
connect(mSelectEncodingAction, &KSelectAction::indexTriggered,
this, &ViewerPrivate::slotSetEncoding);
#endif
QStringList encodings = MimeTreeParser::NodeHelper::supportedEncodings(false);
encodings.prepend(i18n("Auto"));
mSelectEncodingAction->setItems(encodings);
......
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