[QGIS Commit] r13468 - trunk/qgis/python

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-11 18:00:43 -0400 (Tue, 11 May 2010)
New Revision: 13468

Modified:
   trunk/qgis/python/CMakeLists.txt
Log:
tie proxy factory support in SIP bindings to PyQt4 version instead of Qt

Modified: trunk/qgis/python/CMakeLists.txt
===================================================================
--- trunk/qgis/python/CMakeLists.txt	2010-05-11 21:08:45 UTC (rev 13467)
+++ trunk/qgis/python/CMakeLists.txt	2010-05-11 22:00:43 UTC (rev 13468)
@@ -35,10 +35,9 @@
   ADD_DEFINITIONS(-DNOMINMAX)
 ENDIF(MSVC)
 
-MATH(EXPR QT_VERSION "${QT_VERSION_MAJOR}*10000 + ${QT_VERSION_MINOR}*100")
-IF(QT_VERSION LESS 40500)
+IF(${PYQT4_VERSION_STR} VERSION_LESS "4.6.0")
   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
-ENDIF(QT_VERSION LESS 40500)
+ENDIF(${PYQT4_VERSION_STR} VERSION_LESS "4.6.0")
 
 # core module
 FILE(GLOB sip_files_core core/*.sip)