[QGIS Commit] r14325 - trunk/qgis/python

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sun Oct 3 09:56:32 EDT 2010


Author: jef
Date: 2010-10-03 13:56:32 +0000 (Sun, 03 Oct 2010)
New Revision: 14325

Modified:
   trunk/qgis/python/CMakeLists.txt
Log:
fix for #2985 (take III)

Modified: trunk/qgis/python/CMakeLists.txt
===================================================================
--- trunk/qgis/python/CMakeLists.txt	2010-10-03 10:07:45 UTC (rev 14324)
+++ trunk/qgis/python/CMakeLists.txt	2010-10-03 13:56:32 UTC (rev 14325)
@@ -39,9 +39,9 @@
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
 ENDIF(PYQT4_VERSION_NUM LESS 263680)
 
-IF(NOT SIP_VERSION_NUM LESS 266496)	# 0x041100
+IF(NOT PYQT4_VERSION_NUM LESS 263941)	# 0x040705
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
-ENDIF(NOT SIP_VERSION_NUM LESS 266496)
+ENDIF(NOT SIP_VERSION_NUM LESS 263941)
 
 # core module
 FILE(GLOB sip_files_core core/*.sip)



More information about the QGIS-commit mailing list