Commit 3e10b397 authored by Sandro Knauß's avatar Sandro Knauß 🐝
Browse files

Adopt messagelib changes MessageComposerViewBase::fillComposer.

parent 1ba98529
...@@ -66,7 +66,7 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branc ...@@ -66,7 +66,7 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branc
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
set(LIBGRAVATAR_VERSION "5.18.40") set(LIBGRAVATAR_VERSION "5.18.40")
set(MAILCOMMON_LIB_VERSION "5.18.40") set(MAILCOMMON_LIB_VERSION "5.18.40")
set(MESSAGELIB_LIB_VERSION "5.18.43") set(MESSAGELIB_LIB_VERSION "5.18.44")
set(LIBKLEO_LIB_VERSION "5.18.40") set(LIBKLEO_LIB_VERSION "5.18.40")
set(PIMCOMMON_LIB_VERSION "5.18.40") set(PIMCOMMON_LIB_VERSION "5.18.40")
set(LIBKDEPIM_LIB_VERSION "5.18.40") set(LIBKDEPIM_LIB_VERSION "5.18.40")
......
...@@ -792,7 +792,9 @@ MessageComposer::Composer *KMComposerWin::createSimpleComposer() ...@@ -792,7 +792,9 @@ MessageComposer::Composer *KMComposerWin::createSimpleComposer()
mComposerBase->setFrom(from()); mComposerBase->setFrom(from());
mComposerBase->setSubject(subject()); mComposerBase->setSubject(subject());
mComposerBase->setCharsets(charsets); mComposerBase->setCharsets(charsets);
return mComposerBase->createSimpleComposer(); MessageComposer::Composer *composer = new MessageComposer::Composer();
mComposerBase->fillComposer(composer);
return composer;
} }
bool KMComposerWin::canSignEncryptAttachments() const bool KMComposerWin::canSignEncryptAttachments() const
...@@ -2665,7 +2667,8 @@ void KMComposerWin::slotPrintPreview() ...@@ -2665,7 +2667,8 @@ void KMComposerWin::slotPrintPreview()
void KMComposerWin::printComposer(bool preview) void KMComposerWin::printComposer(bool preview)
{ {
MessageComposer::Composer *composer = createSimpleComposer(); MessageComposer::Composer *composer = new MessageComposer::Composer();
mComposerBase->fillComposer(composer);
mMiscComposers.append(composer); mMiscComposers.append(composer);
composer->setProperty("preview", preview); composer->setProperty("preview", preview);
connect(composer, &MessageComposer::Composer::result, this, &KMComposerWin::slotPrintComposeResult); connect(composer, &MessageComposer::Composer::result, this, &KMComposerWin::slotPrintComposeResult);
......
Supports Markdown
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