Commit 8d959da7 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/Applications/16.04'

parents 8c56d118 9adc6cf8
...@@ -207,8 +207,9 @@ bool EventListDelegate::editorEvent(QEvent* e, QAbstractItemModel* model, const ...@@ -207,8 +207,9 @@ bool EventListDelegate::editorEvent(QEvent* e, QAbstractItemModel* model, const
break; break;
case QEvent::MouseButtonRelease: case QEvent::MouseButtonRelease:
{ {
if (!static_cast<EventListView*>(parent())->editOnSingleClick() EventListView* view = static_cast<EventListView*>(parent());
|| !KGlobalSettings::singleClick()) if (!view->editOnSingleClick()
|| !view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, Q_NULLPTR, view))
return false; return false;
QMouseEvent* me = static_cast<QMouseEvent*>(e); QMouseEvent* me = static_cast<QMouseEvent*>(e);
if (me->button() != Qt::LeftButton || me->buttons() if (me->button() != Qt::LeftButton || me->buttons()
......
...@@ -445,7 +445,7 @@ QString KAMail::appendBodyAttachments(KMime::Message& message, JobData& data) ...@@ -445,7 +445,7 @@ QString KAMail::appendBodyAttachments(KMime::Message& message, JobData& data)
contents = f.readAll(); contents = f.readAll();
} }
QByteArray coded = KCodecs::base64Encode(contents, true); QByteArray coded = KCodecs::base64Encode(contents);
KMime::Content* content = new KMime::Content(); KMime::Content* content = new KMime::Content();
content->setBody(coded + "\n\n"); content->setBody(coded + "\n\n");
......
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