Skip to content
Permalink
Browse files

fix windows build

  • Loading branch information
jef-n committed Sep 30, 2017
1 parent 92af1da commit df71901a323801a0660ff2081ec935f1c2fa2250
Showing with 5 additions and 3 deletions.
  1. +1 −0 python/core/qgsdiagramrenderer.sip
  2. +2 −2 scripts/sipify.pl
  3. +2 −1 src/core/qgsdiagramrenderer.h
@@ -11,6 +11,7 @@




class QgsDiagramLayerSettings
{
%Docstring
@@ -757,8 +757,8 @@ sub detect_comment_block{
if ( $LINE =~ m/^(\s*)Q_DECLARE_FLAGS\(\s*(.*?)\s*,\s*(.*?)\s*\)\s*$/ ){
my $ACTUAL_CLASS = $CLASSNAME[$#CLASSNAME];
dbg_info("Declare flags: $ACTUAL_CLASS");
$LINE = "$1typedef QFlags<$ACTUAL_CLASS::$3> $2;\n";
$QFLAG_HASH{"$ACTUAL_CLASS::$2"} = "$ACTUAL_CLASS::$3";
$LINE = "$1typedef QFlags<${ACTUAL_CLASS}::$3> $2;\n";
$QFLAG_HASH{"${ACTUAL_CLASS}::$2"} = "${ACTUAL_CLASS}::$3";
}
# catch Q_DECLARE_OPERATORS_FOR_FLAGS
if ( $LINE =~ m/^(\s*)Q_DECLARE_OPERATORS_FOR_FLAGS\(\s*(.*?)\s*\)\s*$/ ){
@@ -32,7 +32,8 @@
#include "qgspropertycollection.h"
#include "qgsdatadefinedsizelegend.h"

class QgsDiagram;
#include "diagram/qgsdiagram.h"

class QgsDiagramRenderer;
class QgsFeature;
class QgsRenderContext;

0 comments on commit df71901

Please sign in to comment.
You can’t perform that action at this time.