rpm/qgis
SHA256
1
0
Fork 0
forked from pool/qgis
Code Pull Requests Activity

update

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=118
This commit is contained in:
Otto Dassau 2010-11-10 14:26:27 +00:00 committed by Git OBS Bridge
parent ebd9f4aa35
commit d762d5f3e9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qgis15_pyqt4.patch
View File

@ -1,12 +1,12 @@
--- qgis-1.5.0/python/CMakeLists.txt 2010-05-15 10:21:42.000000000 +0200 --- qgis-1.5.0/python/CMakeLists.txt 2010-05-15 10:21:42.000000000 +0200
+++ qgis-1.5.0_new/python/CMakeLists.txt 2010-11-08 12:28:50.532775007 +0100 +++ qgis-1.5.0_new/python/CMakeLists.txt 2010-11-10 15:26:08.394946082 +0100
@@ -39,6 +39,10 @@ @@ -39,6 +39,10 @@
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY) SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
ENDIF(PYQT4_VERSION_NUM LESS 263680) ENDIF(PYQT4_VERSION_NUM LESS 263680)
+IF(NOT PYQT4_VERSION_NUM LESS 263941) # 0x040705 +IF(NOT PYQT4_VERSION_NUM LESS 263941) # 0x040705
+ SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION) + SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
+ENDIF(NOT SIP_VERSION_NUM LESS 263941) +ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
+ +
# core module # core module
FILE(GLOB sip_files_core core/*.sip) FILE(GLOB sip_files_core core/*.sip)