From 96e11b3f903415fceabaefbfab7d922c0629e637 Mon Sep 17 00:00:00 2001
From: Clinton Stimpson <clinton@elemtech.com>
Date: Mon, 12 Nov 2007 13:54:29 -0500
Subject: [PATCH] ENH:  Allow build with Qt 4.2.

      4.3 dependence fell out when errors go to output
      window instead of message box blocking cmake thread.
---
 Source/QtDialog/CMakeLists.txt      |  2 +-
 Source/QtDialog/CMakeSetupDialog.ui | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index 55fa41274..5ce6d24db 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-SET(QT_MIN_VERSION "4.3.0")
+SET(QT_MIN_VERSION "4.2.0")
 FIND_PACKAGE(Qt4 REQUIRED)
 
 IF(NOT QT4_FOUND)
diff --git a/Source/QtDialog/CMakeSetupDialog.ui b/Source/QtDialog/CMakeSetupDialog.ui
index ca95ffef1..b0288b3a3 100644
--- a/Source/QtDialog/CMakeSetupDialog.ui
+++ b/Source/QtDialog/CMakeSetupDialog.ui
@@ -71,16 +71,7 @@
        <enum>QFrame::Raised</enum>
       </property>
       <layout class="QGridLayout" >
-       <property name="leftMargin" >
-        <number>0</number>
-       </property>
-       <property name="topMargin" >
-        <number>0</number>
-       </property>
-       <property name="rightMargin" >
-        <number>0</number>
-       </property>
-       <property name="bottomMargin" >
+       <property name="margin" >
         <number>0</number>
        </property>
        <item row="0" column="0" colspan="6" >