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

update for sip 4.13

Browse Source
This commit is contained in:
Juergen E. Fischer 2011-12-24 05:09:25 +01:00
parent 98f93fffcc
commit 893f305c51
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/SIPMacros.cmake
View File

@ -94,7 +94,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
ELSE(MSVC)
# disable all warnings
ADD_DEFINITIONS( -w )
ADD_DEFINITIONS( -w -fpermissive )
ENDIF(MSVC)
ENDIF(PEDANTIC)

1
python/analysis/analysis.sip
View File

@ -1,4 +1,3 @@
%Module qgis.analysis 0
%Import QtCore/QtCoremod.sip

1
python/core/core.sip
View File

@ -1,4 +1,3 @@
%Module qgis.core 0
%Import QtCore/QtCoremod.sip

4
python/core/qgsvectordataprovider.sip
View File

@ -42,7 +42,9 @@ class QgsVectorDataProvider : QgsDataProvider
ChangeGeometries = 256,
SelectGeometryAtId = 512,
RandomSelectGeometryAtId = 1024,
SequentialSelectGeometryAtId = 2048
SequentialSelectGeometryAtId = 2048,
CreateAttributeIndex = 4096,
SetEncoding = 8192,
};
/** bitmask of all provider's editing capabilities */

4
python/core/symbology-ng-core.sip
View File

@ -629,10 +629,10 @@ class QgsSymbolV2RenderContext
void setAlpha( qreal alpha );
bool selected() const;
void setSelected( bool selected ) const;
void setSelected( bool selected );
//! @note added in 1.5
int renderHints() const;
int renderHints();
//! @note added in 1.5
void setRenderHints( int hints );