SVN commit 1195317 by trueg:

removed the geometry property. This does start the test app with a weird size but its the policy

 M  +5 -12     mergeconflictwidget.ui  


--- trunk/playground/base/nepomuk-kde/backupsync3/gui/backup/mergeconflictwidget.ui #1195316:1195317
@@ -2,17 +2,6 @@
 <ui version="4.0">
  <class>MergeConflictWidget</class>
  <widget class="QWidget" name="MergeConflictWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>398</width>
-    <height>298</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="label">
@@ -25,7 +14,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QTreeView" name="m_viewConflicts"/>
+    <widget class="QTreeView" name="m_viewConflicts">
+     <attribute name="headerVisible">
+      <bool>false</bool>
+     </attribute>
+    </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">