play nice with qt 4.2?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33847 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/ui/CompareUi.ui b/src/frontends/qt4/ui/CompareUi.ui
index 31139e6f71f1b4bede2d8f43800acd59020854cd..5c14bacab8d353ec916a073adcd79eb9a776e5ba 100644 (file)
--- a/src/frontends/qt4/ui/CompareUi.ui
+++ b/src/frontends/qt4/ui/CompareUi.ui
@@ -13,9 +13,6 @@
    <string/>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="bottomMargin">
-    <number>3</number>
-   </property>
    <item row="0" column="0">
     <widget class="QLabel" name="newFileLA">
      <property name="text">
@@ -123,12 +120,6 @@
    </item>
    <item row="6" column="0" colspan="2">
     <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
      <item>
       <spacer>
        <property name="orientation">

diff --git a/src/frontends/qt4/ui/PrefLatexUi.ui b/src/frontends/qt4/ui/PrefLatexUi.ui
index 826226a1cc65b66d5ba8e4a078420c089c369289..63a61258b8c4e72f4670282efdd8b62ed1749e7e 100644 (file)
--- a/src/frontends/qt4/ui/PrefLatexUi.ui
+++ b/src/frontends/qt4/ui/PrefLatexUi.ui
@@ -16,10 +16,10 @@
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout_4">
      <property name="leftMargin">
-      <number>9</number>
+      <number>0</number>
      </property>
      <property name="rightMargin">
-      <number>9</number>
+      <number>0</number>
      </property>
      <item row="0" column="0">
       <widget class="QCheckBox" name="latexEncodingCB">
@@ -133,10 +133,7 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <property name="topMargin">
-       <number>3</number>
-      </property>
-      <property name="bottomMargin">
+      <property name="margin">
        <number>3</number>
       </property>
       <item row="0" column="0">
@@ -211,10 +208,7 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
-      <property name="topMargin">
-       <number>3</number>
-      </property>
-      <property name="bottomMargin">
+      <property name="margin">
        <number>3</number>
       </property>
       <item row="0" column="0">
@@ -289,10 +283,7 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
-      <property name="topMargin">
-       <number>3</number>
-      </property>
-      <property name="bottomMargin">
+      <property name="margin">
        <number>3</number>
       </property>
       <item row="0" column="0">