Skip to content

Commit 2cc6847

Browse files
mbernasocchidakcarto
authored andcommitted
worcarounds to make sip generation work on android
1 parent 10fc681 commit 2cc6847

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

python/core/composer/qgscomposerscalebar.sip

+2
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ class QgsComposerScaleBar: QgsComposerItem
106106

107107
/**Returns the x - positions of the segment borders (in item coordinates) and the width
108108
of the segment*/
109+
%If (!ANDROID)
109110
void segmentPositions( QList<QPair<double, double> >& posWidthList ) const;
111+
%End
110112

111113
/**Sets box size suitable to content*/
112114
void adjustBoxSize();

python/core/qgsclipper.sip

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ class QgsClipper
3838
// feature in x and y. The shapeOpen parameter determines whether
3939
// the function treats the points as a closed shape (polygon), or as
4040
// an open shape (linestring).
41+
42+
%If (!ANDROID)
4143
static void trimFeature( QVector<double>& x,
4244
QVector<double>& y,
4345
bool shapeOpen );
44-
46+
%End
4547
static void trimPolygon( QPolygonF& pts, const QgsRectangle& clipRect );
4648

4749
/**Reads a polyline from WKB and clips it to clipExtent

0 commit comments

Comments
 (0)