Commit 4819a737 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

We depend against kf5.77.0

parent 87df39e5
Pipeline #45359 passed with stage
in 11 minutes and 28 seconds
......@@ -431,11 +431,7 @@ void RichTextComposerActions::createActions(KActionCollection *ac)
d->action_add_table = new KPIMTextEdit::TableActionMenu(d->composerControler->richTextComposer());
d->action_add_table->setIcon(QIcon::fromTheme(QStringLiteral("insert-table")));
d->action_add_table->setText(i18n("Table"));
#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 77, 0)
d->action_add_table->setPopupMode(QToolButton::InstantPopup);
#else
d->action_add_table->setDelayed(false);
#endif
d->action_add_table->setObjectName(QStringLiteral("insert_table"));
d->richTextActionList.append(d->action_add_table);
......
......@@ -6,7 +6,6 @@
*/
#include "emoticontexteditaction.h"
#include "emoticontexteditselector.h"
#include <kwidgetsaddons_version.h>
#include <KLocalizedString>
#include <QMenu>
......@@ -45,11 +44,7 @@ EmoticonTextEditAction::EmoticonTextEditAction(QObject *parent)
delete menu();
setMenu(d->emoticonMenu);
setIcon(QIcon::fromTheme(QStringLiteral("face-smile")));
#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 77, 0)
setPopupMode(QToolButton::InstantPopup);
#else
setDelayed(false);
#endif
connect(d->selector, &EmoticonTextEditSelector::itemSelected, this, &EmoticonTextEditAction::emoticonActivated);
}
......
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