Skip to content

Commit

Permalink
fix another build error and some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Nov 15, 2012
1 parent af904b9 commit 5053818
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion python/plugins/sextante/CMakeLists.txt
Expand Up @@ -7,7 +7,7 @@ ADD_SUBDIRECTORY(ftools)
ADD_SUBDIRECTORY(gdal)
ADD_SUBDIRECTORY(grass)
ADD_SUBDIRECTORY(gui)
ADD_SUBDIRECTORY(help)
#ADD_SUBDIRECTORY(help)
ADD_SUBDIRECTORY(images)
ADD_SUBDIRECTORY(lidar)
ADD_SUBDIRECTORY(mmqgisx)
Expand Down
1 change: 0 additions & 1 deletion src/core/composer/qgscomposerlegend.h
Expand Up @@ -212,7 +212,6 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
@param p painter
@param layerItem parent model item (layer)
@param currentPosition in/out: current y position of legend item
@param maxXCoord in/out: maximum x-coordinate of the whole legend
@param layerOpacity opacity of the corresponding map layer
*/
QSizeF drawLayerChildItems( QPainter* p, QStandardItem* layerItem, Position& currentPosition, int layerOpacity = 255 );
Expand Down
1 change: 1 addition & 0 deletions src/mapserver/qgsprojectparser.cpp
Expand Up @@ -2643,6 +2643,7 @@ bool QgsProjectParser::annotationPosition( const QDomElement& elem, double scale

void QgsProjectParser::drawAnnotationRectangle( QPainter* p, const QDomElement& elem, double scaleFactor, double xPos, double yPos, int itemWidth, int itemHeight )
{
Q_UNUSED( scaleFactor );
if ( !p )
{
return;
Expand Down

0 comments on commit 5053818

Please sign in to comment.