Commit 109ce5a3 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

GIT_SILENT: Time to increase version

parent cc3b0e7c
......@@ -4,7 +4,7 @@ set(PIM_VERSION "5.13.40")
project(KPimTextEdit VERSION ${PIM_VERSION})
# ECM setup
set(KF5_MIN_VERSION "5.64.0")
set(KF5_MIN_VERSION "5.65.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
......
......@@ -33,7 +33,6 @@
#include <sonnet/backgroundchecker.h>
#include <Sonnet/Dialog>
#include "texttospeech/texttospeech.h"
#include <sonnet_version.h>
#include <QMenu>
#include <QDBusConnection>
......@@ -362,12 +361,7 @@ void PlainTextEditor::slotCheckSpelling()
connect(spellDialog, &Sonnet::Dialog::replace, this, &PlainTextEditor::slotSpellCheckerCorrected);
connect(spellDialog, &Sonnet::Dialog::misspelling, this, &PlainTextEditor::slotSpellCheckerMisspelling);
connect(spellDialog, &Sonnet::Dialog::autoCorrect, this, &PlainTextEditor::slotSpellCheckerAutoCorrect);
#if SONNET_VERSION < QT_VERSION_CHECK(5, 65, 0)
connect(spellDialog, QOverload<const QString &>::of(&Sonnet::Dialog::done),
this, &PlainTextEditor::slotSpellCheckerFinished);
#else
connect(spellDialog, &Sonnet::Dialog::spellCheckDone, this, &PlainTextEditor::slotSpellCheckerFinished);
#endif
connect(spellDialog, &Sonnet::Dialog::cancel, this, &PlainTextEditor::slotSpellCheckerCanceled);
connect(spellDialog, &Sonnet::Dialog::spellCheckStatus, this, &PlainTextEditor::spellCheckStatus);
connect(spellDialog, &Sonnet::Dialog::languageChanged, this, &PlainTextEditor::languageChanged);
......
......@@ -38,7 +38,6 @@
#include <sonnet/speller.h>
#include <texttospeech/texttospeech.h>
#include <SonnetCore/sonnet/backgroundchecker.h>
#include <sonnet_version.h>
#include <KIO/KUriFilterSearchProviderActions>
#include <QMenu>
......@@ -462,21 +461,12 @@ void RichTextEditor::checkSpelling(bool force)
connect(spellDialog, &Sonnet::Dialog::replace, this, &RichTextEditor::slotSpellCheckerCorrected);
connect(spellDialog, &Sonnet::Dialog::misspelling, this, &RichTextEditor::slotSpellCheckerMisspelling);
connect(spellDialog, &Sonnet::Dialog::autoCorrect, this, &RichTextEditor::slotSpellCheckerAutoCorrect);
#if SONNET_VERSION < QT_VERSION_CHECK(5, 65, 0)
connect(spellDialog, QOverload<const QString &>::of(&Sonnet::Dialog::done),
this, &RichTextEditor::slotSpellCheckerFinished);
#else
connect(spellDialog, &Sonnet::Dialog::spellCheckDone, this, &RichTextEditor::slotSpellCheckerFinished);
#endif
connect(spellDialog, &Sonnet::Dialog::cancel, this, &RichTextEditor::slotSpellCheckerCanceled);
connect(spellDialog, &Sonnet::Dialog::spellCheckStatus, this, &RichTextEditor::spellCheckStatus);
connect(spellDialog, &Sonnet::Dialog::languageChanged, this, &RichTextEditor::languageChanged);
if (force) {
#if SONNET_VERSION < QT_VERSION_CHECK(5, 65, 0)
connect(spellDialog, SIGNAL(done(QString)), this, SIGNAL(spellCheckingFinished()));
#else
connect(spellDialog, &Sonnet::Dialog::spellCheckDone, this, &RichTextEditor::spellCheckingFinished);
#endif
connect(spellDialog, &Sonnet::Dialog::cancel, this, &RichTextEditor::spellCheckingCanceled);
}
......
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