diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2007-11-12 18:54:29 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2007-11-12 18:54:29 (GMT) |
| commit | 96e11b3f903415fceabaefbfab7d922c0629e637 (patch) | |
| tree | 057bd6e1d2bd75f799ad0b1ccaa8c8e5324641d8 /Source/QtDialog | |
| parent | d22df5bef40c1c922696d8fab78832efb66a5841 (diff) | |
| download | CMake-96e11b3f903415fceabaefbfab7d922c0629e637.zip CMake-96e11b3f903415fceabaefbfab7d922c0629e637.tar.gz CMake-96e11b3f903415fceabaefbfab7d922c0629e637.tar.bz2 | |
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.
Diffstat (limited to 'Source/QtDialog')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | 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 55fa412..5ce6d24 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 ca95ffe..b0288b3 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" > |