Changeset 14988


Ignore:
Timestamp:
Dec 31, 2010, 3:55:54 PM (14 years ago)
Author:
jef
Message:

fix #3378

Location:
trunk/qgis/python
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/qgis/python/CMakeLists.txt

    r14330 r14988  
    4444ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
    4545
     46IF(NOT PYQT4_VERSION_NUM LESS 264194)   # 0x040802
     47  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
     48ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
     49
    4650# core module
    4751FILE(GLOB sip_files_core core/*.sip)

  • trunk/qgis/python/core/conversions.sip

    r14323 r14988  
    1616
    1717%Feature QSETINT_CONVERSION
     18%Feature QSETTYPE_CONVERSION
    1819
    1920%ModuleHeaderCode
    … …  
    321322%End
    322323
    323 
     324%If (QSETTYPE_CONVERSION)
    324325template <TYPE>
    325326%MappedType QSet<TYPE>
    … …  
    395396
    396397};
    397 
    398 
     398%End
    399399
    400400template<TYPE>
Note: See TracChangeset for help on using the changeset viewer.