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

CMakeLists.txt

@@ -25,16 +25,16 @@ include(ECMAddTests)
 include(ECMCoverageOption)
 
 set(MAILCOMMON_LIB_VERSION ${PIM_VERSION})
-set(AKONADIMIME_LIB_VERSION "5.7.80")
-set(MESSAGELIB_LIB_VERSION "5.7.80")
+set(AKONADIMIME_LIB_VERSION "5.8.0")
+set(MESSAGELIB_LIB_VERSION "5.8.0")
 set(QT_REQUIRED_VERSION "5.8.0")
-set(KMIME_LIB_VERSION "5.7.80")
-set(KMAILTRANSPORT_LIB_VERSION "5.7.80")
-set(MAILIMPORTER_LIB_VERSION "5.7.80")
-set(LIBKDEPIM_LIB_VERSION "5.7.80")
-set(PIMCOMMON_LIB_VERSION "5.7.80")
+set(KMIME_LIB_VERSION "5.8.0")
+set(KMAILTRANSPORT_LIB_VERSION "5.8.0")
+set(MAILIMPORTER_LIB_VERSION "5.8.0")
+set(LIBKDEPIM_LIB_VERSION "5.8.0")
+set(PIMCOMMON_LIB_VERSION "5.8.0")
 
-set(AKONADI_VERSION "5.7.80")
+set(AKONADI_VERSION "5.8.0")
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml)
 

src/filter/invalidfilters/invalidfilterdialog.cpp

@@ -45,6 +45,7 @@ InvalidFilterDialog::InvalidFilterDialog(QWidget *parent)
 
     QWidget *w = new QWidget(this);
     QVBoxLayout *vbox = new QVBoxLayout;
+    vbox->setMargin(0);
     w->setLayout(vbox);
     mInvalidFilterWidget = new InvalidFilterWidget(this);
     mInvalidFilterWidget->setObjectName(QStringLiteral("invalid_filter_widget"));