Skip to content

Commit

Permalink
fix for #2985 (take III)
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14325 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Oct 3, 2010
1 parent 7172f01 commit df67a27
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ IF(PYQT4_VERSION_NUM LESS 263680) # 0x040600
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)
Expand Down

0 comments on commit df67a27

Please sign in to comment.