Commit 1c7af2d7 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/19.12'

parents a8b51e63 f0253059
......@@ -244,4 +244,7 @@
<provides>
<binary>kmail</binary>
</provides>
<releases>
<release version="5.13.0" date="2019-12-12"/>
</releases>
</component>
......@@ -69,6 +69,7 @@
#include <Akonadi/KMime/MessageFlags>
#include "kpimtextedit/texttospeech.h"
#include <mailcommon/mailutil.h>
#include "messageviewer/config-messageviewer.h"
#ifdef USE_DKIM_CHECKER
#include <MessageViewer/DKIMWidgetInfo>
#endif
......@@ -111,8 +112,9 @@ void KMReaderMainWin::initKMReaderMainWin()
mZoomLabelIndicator = new ZoomLabelWidget(statusBar());
statusBar()->addPermanentWidget(mZoomLabelIndicator);
setZoomChanged(mReaderWin->viewer()->webViewZoomFactor());
#ifdef USE_DKIM_CHECKER
statusBar()->addPermanentWidget(mReaderWin->viewer()->dkimWidgetInfo());
#endif
if (!mReaderWin->message().isValid()) {
menuBar()->hide();
toolBar(QStringLiteral("mainToolBar"))->hide();
......
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