sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix another build error and some warnings

Browse Source
This commit is contained in:
Juergen E. Fischer 2012-11-16 00:13:43 +01:00
parent af904b9b39
commit 5053818440
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/sextante/CMakeLists.txt
View File

@ -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)

1
src/core/composer/qgscomposerlegend.h
View File

@ -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 );

1
src/mapserver/qgsprojectparser.cpp
View File

@ -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;