Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix gui bindings with SIP 4.15
  • Loading branch information
jef-n committed Sep 24, 2013
1 parent 2301c91 commit 8385386
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
7 changes: 7 additions & 0 deletions debian/changelog
@@ -1,3 +1,10 @@
qgis (2.0.1-2) UNRELEASED; urgency=low

* add support for debian jessie and ubuntu saucy
* backport some patches from master

-- Jürgen E. Fischer <jef@norbit.de> Sun, 22 Sep 2013 21:44:48 +0200

qgis (2.0.1-1) UNRELEASED; urgency=low

* drop qgis_icon.xpm and use "upstream" version
Expand Down
6 changes: 6 additions & 0 deletions python/CMakeLists.txt
Expand Up @@ -91,6 +91,12 @@ INCLUDE_DIRECTORIES(
FILE(GLOB_RECURSE sip_files_gui gui/*.sip)
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui})
SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api)

IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)
SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS})
ADD_DEFINITIONS(-Dprotected=public)
ENDIF(UNIX AND NOT SIP_VERSION_NUM LESS 265984)

ADD_SIP_PYTHON_MODULE(qgis.gui gui/gui.sip qgis_core qgis_gui)

# additional analysis includes
Expand Down

0 comments on commit 8385386

Please sign in to comment.