Skip to content

Commit a450aac

Browse files
jef-nalexbruy
authored andcommitted
update for sip 4.13
1 parent 2b39c0f commit a450aac

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

cmake/SIPMacros.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP)
9494
ADD_DEFINITIONS( /wd4996 /wd4701 /wd4702 )
9595
ELSE(MSVC)
9696
# disable all warnings
97-
ADD_DEFINITIONS( -w )
97+
ADD_DEFINITIONS( -w -fpermissive )
9898
ENDIF(MSVC)
9999
ENDIF(PEDANTIC)
100100

python/analysis/analysis.sip

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
%Module qgis.analysis 0
32

43
%Import QtCore/QtCoremod.sip

python/core/core.sip

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
%Module qgis.core 0
32

43
%Import QtCore/QtCoremod.sip

python/core/qgsvectordataprovider.sip

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ class QgsVectorDataProvider : QgsDataProvider
4242
ChangeGeometries = 256,
4343
SelectGeometryAtId = 512,
4444
RandomSelectGeometryAtId = 1024,
45-
SequentialSelectGeometryAtId = 2048
45+
SequentialSelectGeometryAtId = 2048,
46+
CreateAttributeIndex = 4096,
47+
SetEncoding = 8192,
4648
};
4749

4850
/** bitmask of all provider's editing capabilities */

python/core/symbology-ng-core.sip

+2-2
Original file line numberDiff line numberDiff line change
@@ -619,10 +619,10 @@ class QgsSymbolV2RenderContext
619619
void setAlpha( qreal alpha );
620620

621621
bool selected() const;
622-
void setSelected( bool selected ) const;
622+
void setSelected( bool selected );
623623

624624
//! @note added in 1.5
625-
int renderHints() const;
625+
int renderHints();
626626
//! @note added in 1.5
627627
void setRenderHints( int hints );
628628

0 commit comments

Comments
 (0)