sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

version compare is not strict

Browse Source 
also fix sipify test
This commit is contained in:
Denis Rouzaud 2018-01-16 11:54:23 -04:00
parent 458cab7b20
commit 4a0eedde2e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/CMakeLists.txt
View File

@ -175,10 +175,10 @@ ENDIF(NOT QT_MOBILITY_LOCATION_FOUND)
# * prepend auto-generated Python signature to existing Docstrings # * prepend auto-generated Python signature to existing Docstrings
# * document template based classes # * document template based classes
SET(DOCSTRINGSTEMPLATE "//") SET(DOCSTRINGSTEMPLATE "//")
IF(${SIP_VERSION_STR} VERSION_GREATER 4.19.6) IF(${SIP_VERSION_STR} VERSION_GREATER 4.19.7)
SET(DEFAULTDOCSTRINGSIGNATURE "%DefaultDocstringSignature \"prepended\"") SET(DEFAULTDOCSTRINGSIGNATURE "%DefaultDocstringSignature \"prepended\"")
SET(DOCSTRINGSTEMPLATE "") SET(DOCSTRINGSTEMPLATE "")
ENDIF(${SIP_VERSION_STR} VERSION_GREATER 4.19.6) ENDIF(${SIP_VERSION_STR} VERSION_GREATER 4.19.7)
# core module # core module
FILE(GLOB_RECURSE sip_files_core core/*.sip core/*.sip.in) FILE(GLOB_RECURSE sip_files_core core/*.sip core/*.sip.in)

2
tests/code_layout/sipifyheader.expected.sip
View File

@ -307,7 +307,7 @@ remove argument
void FallBackToPublic(); void FallBackToPublic();
private: private:
void ShowThisPrivateOne() ; void ShowThisPrivateOne();
}; };
class ClassWithPrivateInheritanceOnly /Abstract/ class ClassWithPrivateInheritanceOnly /Abstract/