Skip to content

Commit

Permalink
Fix QgsComposerMap sip/cpp build error
Browse files Browse the repository at this point in the history
  • Loading branch information
dakcarto committed Jul 11, 2014
1 parent 061dc4f commit 0ad70ed
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposermap.cpp
Expand Up @@ -1794,7 +1794,7 @@ void QgsComposerMap::setGridBlendMode( QPainter::CompositionMode blendMode )
g->setBlendMode( blendMode );
}

QPainter::CompositionMode QgsComposerMap::gridBlendMode()
QPainter::CompositionMode QgsComposerMap::gridBlendMode() const
{
const QgsComposerMapGrid* g = constFirstMapGrid();
return g->blendMode();
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposermap.h
Expand Up @@ -432,7 +432,7 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
QgsLineSymbolV2* gridLineSymbol();

/** Returns the grid's blending mode */
QPainter::CompositionMode gridBlendMode();
QPainter::CompositionMode gridBlendMode() const;
/** Sets the grid's blending mode*/
void setGridBlendMode( QPainter::CompositionMode blendMode );

Expand Down

1 comment on commit 0ad70ed

@dakcarto
Copy link
Member Author

Choose a reason for hiding this comment

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

@mhugent The qgscomposermap.sip file already had:

QPainter::CompositionMode gridBlendMode() const;

but the corresponding .cpp files did not, which caused a build error for the qgis.core Python module here on Mac. I assume this is the correct fix. Please verify.

Please sign in to comment.