mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
fix for #2985 (take III)
git-svn-id: http://svn.osgeo.org/qgis/trunk@14325 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
926fc951a7
commit
82edec5a70
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user