Skip to content

Commit

Permalink
remove sip workaround (fixes #17038, refs #16071)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Aug 20, 2017
1 parent 9018414 commit 7e4345a
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion python/core/qgscoordinatetransform.sip
View file
Expand Up @@ -15,7 +15,6 @@
class QgsCoordinateTransform : QObject
{
%TypeHeaderCode
extern PyObject *sipExportedExceptions__core[2]; // workaround: sipExportedExceptions__core is only defined in the first sip part
#include <qgscoordinatetransform.h>
%End

Expand Down

7 comments on commit 7e4345a

@3nids
Copy link
Member

@3nids 3nids commented on 7e4345a Aug 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getting an error here
image
I did clean without success...

@3nids
Copy link
Member

@3nids 3nids commented on 7e4345a Aug 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverting this allows me to compile....any idea @jef-n ?

@jef-n
Copy link
Member Author

@jef-n jef-n commented on 7e4345a Aug 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

upgrade sip? which version are you using?

@3nids
Copy link
Member

@3nids 3nids commented on 7e4345a Aug 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4.19.1

@jef-n
Copy link
Member Author

@jef-n jef-n commented on 7e4345a Aug 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FTR the ticket is https://issues.qgis.org/issues/17039

@jef-n
Copy link
Member Author

@jef-n jef-n commented on 7e4345a Aug 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does that help for you?

diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip
index f9b7854c32..900967d37f 100644
--- a/python/core/qgscoordinatetransform.sip
+++ b/python/core/qgscoordinatetransform.sip
@@ -15,7 +15,9 @@
 class QgsCoordinateTransform : QObject
 {
 %TypeHeaderCode
+#if (SIP_VERSION >= 0x041300 && SIP_VERSION < 0x041303)
 extern PyObject *sipExportedExceptions__core[2];  // workaround: sipExportedExceptions__core is only defined in the first sip part
+#endif
 #include <qgscoordinatetransform.h>
 %End

Not sure whether 4.19.2 is also affected though...

@3nids
Copy link
Member

@3nids 3nids commented on 7e4345a Aug 22, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, it does the trick!

Please sign in to comment.