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

We depends against kf5.77

parent 75ea8116
Pipeline #45369 passed with stage
in 18 minutes and 5 seconds
......@@ -8,8 +8,6 @@
#include "newalarmaction.h"
#include <kwidgetsaddons_version.h>
#include "functions.h"
#include "templatemenuaction.h"
#include "resources/datamodel.h"
......@@ -75,11 +73,7 @@ NewAlarmAction::NewAlarmAction(bool templates, const QString& label, QObject* pa
connect(DataModel::allTemplateListModel(), &EventListModel::haveEventsStatus, this, &NewAlarmAction::slotCalendarStatusChanged);
slotCalendarStatusChanged(); // initialise action states
}
#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 77, 0)
setPopupMode(QToolButton::InstantPopup);
#else
setDelayed(false);
#endif
connect(menu(), &QMenu::aboutToShow, this, &NewAlarmAction::slotInitMenu);
connect(menu(), &QMenu::triggered, this, &NewAlarmAction::slotSelected);
}
......
......@@ -12,7 +12,6 @@
#include "resourcescalendar.h"
#include "kalarm_debug.h"
#include <kwidgetsaddons_version.h>
#include <KAlarmCal/KAEvent>
#include <QMenu>
......@@ -21,11 +20,7 @@
TemplateMenuAction::TemplateMenuAction(const QIcon& icon, const QString& label, QObject* parent)
: KActionMenu(icon, label, parent)
{
#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 77, 0)
setPopupMode(QToolButton::InstantPopup);
#else
setDelayed(false);
#endif
connect(menu(), &QMenu::aboutToShow, this, &TemplateMenuAction::slotInitMenu);
connect(menu(), &QMenu::triggered, this, &TemplateMenuAction::slotSelected);
}
......
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