[cmake-commits] clinton committed CMakeLists.txt 1.4 1.5 CMakeSetupDialog.ui 1.12 1.13

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/QtDialog
In directory public:/mounts/ram/cvs-serv32299

Modified Files:
	CMakeLists.txt CMakeSetupDialog.ui 
Log Message:
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.



Index: CMakeSetupDialog.ui
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeSetupDialog.ui,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- CMakeSetupDialog.ui	10 Nov 2007 16:36:09 -0000	1.12
+++ CMakeSetupDialog.ui	12 Nov 2007 18:54:29 -0000	1.13
@@ -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" >

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/QtDialog/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CMakeLists.txt	7 Nov 2007 04:00:23 -0000	1.4
+++ CMakeLists.txt	12 Nov 2007 18:54:29 -0000	1.5
@@ -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)