Commit 990e4bed authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Make it compile against last qt5.15 without deprecated method

parent e9d59af0
...@@ -723,7 +723,8 @@ void AlarmDialog::eventNotification() ...@@ -723,7 +723,8 @@ void AlarmDialog::eventNotification()
program = QLatin1Char('\"') + program + QLatin1Char('\"'); program = QLatin1Char('\"') + program + QLatin1Char('\"');
} }
QProcess::startDetached(program + QLatin1Char(' ') + alarm->programArguments()); //TODO move alarm->programArguments() as argument of QProcess API ?
QProcess::startDetached(program + QLatin1Char(' ') + alarm->programArguments(), QStringList());
} else if (alarm->type() == Alarm::Audio) { } else if (alarm->type() == Alarm::Audio) {
beeped = true; beeped = true;
Phonon::MediaObject *player Phonon::MediaObject *player
......
...@@ -87,11 +87,17 @@ NoteEditDialog::NoteEditDialog(QWidget *parent) ...@@ -87,11 +87,17 @@ NoteEditDialog::NoteEditDialog(QWidget *parent)
"Calendar where the new note will be stored.")); "Calendar where the new note will be stored."));
#endif #endif
mCollectionCombobox->setToolTip(i18n("Calendar where the new note will be stored.")); mCollectionCombobox->setToolTip(i18n("Calendar where the new note will be stored."));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
connect(mCollectionCombobox, connect(mCollectionCombobox,
QOverload<int>::of( QOverload<int>::of(
&Akonadi::CollectionComboBox::currentIndexChanged), this, &Akonadi::CollectionComboBox::currentIndexChanged), this,
&NoteEditDialog::slotCollectionChanged); &NoteEditDialog::slotCollectionChanged);
#else
connect(mCollectionCombobox,
QOverload<int, const QString &>::of(
&Akonadi::CollectionComboBox::currentIndexChanged), this,
&NoteEditDialog::slotCollectionChanged);
#endif
connect(mCollectionCombobox, QOverload<int>::of( connect(mCollectionCombobox, QOverload<int>::of(
&Akonadi::CollectionComboBox::activated), this, &Akonadi::CollectionComboBox::activated), this,
&NoteEditDialog::slotCollectionChanged); &NoteEditDialog::slotCollectionChanged);
......
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