Skip to content

Commit 3cf96c2

Browse files
author
jef
committed
fix for #2985
git-svn-id: http://svn.osgeo.org/qgis/trunk@14323 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent df1a16e commit 3cf96c2

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

python/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ IF(PYQT4_VERSION_NUM LESS 263680) # 0x040600
3939
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} PROXY_FACTORY)
4040
ENDIF(PYQT4_VERSION_NUM LESS 263680)
4141

42+
IF(NOT PYQT4_VERSION_NUM LESS 266496) # 0x041100
43+
SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
44+
ENDIF(NOT PYQT4_VERSION_NUM LESS 266496)
45+
4246
# core module
4347
FILE(GLOB sip_files_core core/*.sip)
4448
set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})

python/core/conversions.sip

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ which are not wrapped by PyQt:
1414
- QMap<int, QgsOverlayObject*>*
1515
*/
1616

17+
%Feature QSETINT_CONVERSION
18+
1719
%ModuleHeaderCode
1820
// From Python 2.5, some functions use Py_ssize_t instead of int
1921
// thus this typedef is for maintaining backward compatibility
@@ -264,7 +266,7 @@ template <TYPE>
264266

265267

266268

267-
269+
%If (QSETINT_CONVERSION)
268270
%MappedType QSet<int>
269271
{
270272
%TypeHeaderCode
@@ -316,6 +318,7 @@ template <TYPE>
316318
%End
317319

318320
};
321+
%End
319322

320323

321324
template <TYPE>

0 commit comments

Comments
 (0)