Merge pull request #407 from matthias-kuhn/expression-builder-margin

Fix for #6165 - Overlapping widgets in expression builder dialog

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>