From a5570baa6692e18228e264b21bdfd873a62a85dc Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Wed, 20 Jul 2016 13:55:41 +0200
Subject: [PATCH] Remove duplicate margin

---
 .../dialog/selectthunderbirdfilterfilesdialog.cpp  |  2 +-
 .../ui/selectthunderbirdfilterfileswidget.ui       | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp b/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
index 8fa351c..e3d6703 100644
--- a/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
+++ b/src/filter/dialog/selectthunderbirdfilterfilesdialog.cpp
@@ -32,7 +32,7 @@ SelectThunderbirdFilterFilesDialog::SelectThunderbirdFilterFilesDialog(const QSt
     : QDialog(parent)
 {
     setWindowTitle(i18n("Select thunderbird filter files"));
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
     QVBoxLayout *mainLayout = new QVBoxLayout;
     setLayout(mainLayout);
     QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
diff --git a/src/filter/ui/selectthunderbirdfilterfileswidget.ui b/src/filter/ui/selectthunderbirdfilterfileswidget.ui
index ac3f440..6037922 100644
--- a/src/filter/ui/selectthunderbirdfilterfileswidget.ui
+++ b/src/filter/ui/selectthunderbirdfilterfileswidget.ui
@@ -11,6 +11,18 @@
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item row="0" column="0">
     <widget class="QRadioButton" name="selectFile">
      <property name="text">
@@ -53,7 +65,7 @@
   </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
-   <extends>QFrame</extends>
+   <extends>QWidget</extends>
    <header>kurlrequester.h</header>
   </customwidget>
  </customwidgets>