From fb63167a47935c11ce092b700cdc24d69cd3a35f Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias.kuhn@gmx.ch>
Date: Mon, 28 Jan 2013 14:25:17 +0100
Subject: [PATCH] Fix for #6165 - Overlapping widgets in expression builder
 dialog Reset the top margin of widgets to the default value

---
 src/ui/qgsexpressionbuilder.ui | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/ui/qgsexpressionbuilder.ui b/src/ui/qgsexpressionbuilder.ui
index 9d5d1886c46..350855c7831 100644
--- a/src/ui/qgsexpressionbuilder.ui
+++ b/src/ui/qgsexpressionbuilder.ui
@@ -43,7 +43,13 @@
         <bool>true</bool>
        </property>
        <layout class="QGridLayout" name="gridLayout_6">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <property name="spacing">
@@ -113,9 +119,6 @@
           <property name="leftMargin">
            <number>0</number>
           </property>
-          <property name="topMargin">
-           <number>3</number>
-          </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
@@ -147,9 +150,6 @@
           <property name="leftMargin">
            <number>0</number>
           </property>
-          <property name="topMargin">
-           <number>3</number>
-          </property>
           <property name="rightMargin">
            <number>0</number>
           </property>
@@ -272,9 +272,6 @@
       <property name="leftMargin">
        <number>0</number>
       </property>
-      <property name="topMargin">
-       <number>4</number>
-      </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
@@ -472,9 +469,6 @@
       <property name="leftMargin">
        <number>0</number>
       </property>
-      <property name="topMargin">
-       <number>3</number>
-      </property>
       <property name="rightMargin">
        <number>0</number>
       </property>
@@ -509,8 +503,6 @@
    <header>qgsfilterlineedit.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../../images/images.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>