Skip to content

Commit 0693fe9

Browse files
jef-njef-n
committedMar 29, 2014
fix some tests crashes, fix some tests and some mtr updates
·
ltr-3_40archive/master_2
1 parent 480ae45 commit 0693fe9

37 files changed

+166
-231
lines changed
 

‎debian/control.jessie

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Build-Depends:
3737
graphviz,
3838
txt2tags,
3939
xvfb, xauth,
40-
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
40+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
41+
spawn-cgi, lighttpd, poppler-utils
4142
Build-Conflicts: libqgis-dev, qgis-dev
4243
Standards-Version: 3.9.5
4344
Homepage: http://qgis.org/

‎debian/control.precise

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ Build-Depends:
3838
graphviz,
3939
txt2tags,
4040
xvfb, xauth,
41-
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
41+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
42+
spawn-cgi, lighttpd, poppler-utils
4243
Build-Conflicts: libqgis-dev, qgis-dev
4344
Standards-Version: 3.8.4
4445
XS-Python-Version: current

‎debian/control.quantal

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Build-Depends:
3737
graphviz,
3838
txt2tags,
3939
xvfb, xauth,
40-
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
40+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
41+
spawn-cgi, lighttpd, poppler-utils
4142
Build-Conflicts: libqgis-dev, qgis-dev
4243
Standards-Version: 3.9.3
4344
XS-Python-Version: current

‎debian/control.raring

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ Build-Depends:
3939
graphviz,
4040
txt2tags,
4141
xvfb, xauth,
42-
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
42+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
43+
spawn-cgi, lighttpd, poppler-utils
4344
Build-Conflicts: libqgis-dev, qgis-dev
4445
Standards-Version: 3.8.4
4546
XS-Python-Version: current

‎debian/control.saucy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ Build-Depends:
3939
graphviz,
4040
txt2tags,
4141
xvfb, xauth,
42-
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
42+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
43+
spawn-cgi, lighttpd, poppler-utils
4344
Build-Conflicts: libqgis-dev, qgis-dev
4445
Standards-Version: 3.8.4
4546
XS-Python-Version: current

‎debian/control.sid

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Build-Depends:
3737
graphviz,
3838
txt2tags,
3939
xvfb, xauth,
40-
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
40+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
41+
spawn-cgi, lighttpd, poppler-utils
4142
Build-Conflicts: libqgis-dev, qgis-dev
4243
Standards-Version: 3.9.5
4344
Homepage: http://qgis.org/

‎debian/control.sid-oracle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ Build-Depends:
3838
txt2tags,
3939
xvfb, xauth,
4040
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
41-
oracle-instantclient11.2-devel
41+
oracle-instantclient11.2-devel,
42+
spawn-cgi, lighttpd, poppler-utils
4243
Build-Conflicts: libqgis-dev, qgis-dev
4344
Standards-Version: 3.9.5
4445
Homepage: http://qgis.org/

‎debian/control.trusty

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Build-Depends:
3737
graphviz,
3838
txt2tags,
3939
xvfb, xauth,
40-
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
40+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
41+
spawn-cgi, lighttpd, poppler-utils
4142
Build-Conflicts: libqgis-dev, qgis-dev
4243
Standards-Version: 3.8.4
4344
XS-Python-Version: current

‎debian/control.wheezy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ Build-Depends:
3737
graphviz,
3838
txt2tags,
3939
xvfb, xauth,
40-
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable
40+
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
41+
spawn-cgi, lighttpd, poppler-utils
4142
Build-Conflicts: libqgis-dev, qgis-dev
4243
Standards-Version: 3.9.3
4344
XS-Python-Version: current

‎debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ build-stamp: debian/build/CMakeCache.txt
143143

144144
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
145145
# Code to run the package test suite - and ignore the outcome for now
146-
-LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(TESTMAKE) -C debian/build $(DEB_TEST_TARGET)
146+
-LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) PATH=/usr/sbin:$(PATH) LC_CTYPE=C.UTF-8 $(TESTMAKE) -C debian/build $(DEB_TEST_TARGET)
147147
else
148148
@echo Skipping tests.
149149
endif

‎python/core/qgsmaprenderercache.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* the cache listens to repaintRequested() signals from layer. If triggered, the cache
77
* removes the rendered image (and disconnects from the layer).
88
*
9-
* The class is thread-safe (multiple classes can access the same instance safely).
9+
* The class is thread-safe (multiple classes can access the same instance safely).
1010
*
1111
* @note added in 2.4
1212
*/

‎src/app/qgisapp.cpp

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -448,11 +448,11 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
448448
, mMousePrecisionDecimalPlaces( 0 )
449449
, mInternalClipboard( 0 )
450450
, mShowProjectionTab( false )
451-
, mPythonUtils( NULL )
451+
, mPythonUtils( 0 )
452452
#ifdef Q_OS_WIN
453453
, mSkipNextContextMenuEvent( 0 )
454454
#endif
455-
, mpGpsWidget( NULL )
455+
, mpGpsWidget( 0 )
456456
{
457457
if ( smInstance )
458458
{
@@ -785,6 +785,7 @@ QgisApp::QgisApp( )
785785
mMapCanvas->freeze();
786786
mMapLegend = new QgsLegend( mMapCanvas );
787787
mUndoWidget = new QgsUndoWidget( NULL, mMapCanvas );
788+
mInfoBar = new QgsMessageBar( centralWidget() );
788789
// More tests may need more members to be initialized
789790
}
790791

@@ -3785,12 +3786,7 @@ void QgisApp::dxfExport()
37853786
dxfExport.setSymbologyExport( d.symbologyMode() );
37863787
if ( mapCanvas() )
37873788
{
3788-
QgsMapRenderer* r = mapCanvas()->mapRenderer();
3789-
if ( r )
3790-
{
3791-
dxfExport.setMapUnits( r->mapUnits() );
3792-
}
3793-
3789+
dxfExport.setMapUnits( mapCanvas()->mapUnits() );
37943790
//extent
37953791
if ( d.exportMapExtent() )
37963792
{

‎src/core/composer/qgscomposermap.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@
4242
#include <cmath>
4343

4444
QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int width, int height )
45-
: QgsComposerItem( x, y, width, height, composition ), mMapRotation( 0 ), mKeepLayerSet( false ),
46-
mOverviewFrameMapId( -1 ), mOverviewBlendMode( QPainter::CompositionMode_SourceOver ), mOverviewInverted( false ), mOverviewCentered( false ),
47-
mGridEnabled( false ), mGridStyle( Solid ),
48-
mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mGridAnnotationFontColor( QColor( 0, 0, 0 ) ),
49-
mGridAnnotationPrecision( 3 ), mShowGridAnnotation( false ), mGridBlendMode( QPainter::CompositionMode_SourceOver ),
50-
mLeftGridAnnotationPosition( OutsideMapFrame ), mRightGridAnnotationPosition( OutsideMapFrame ),
51-
mTopGridAnnotationPosition( OutsideMapFrame ), mBottomGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ),
52-
mLeftGridAnnotationDirection( Horizontal ), mRightGridAnnotationDirection( Horizontal ), mTopGridAnnotationDirection( Horizontal ),
53-
mBottomGridAnnotationDirection( Horizontal ), mGridFrameStyle( NoGridFrame ), mGridFrameWidth( 2.0 ),
54-
mGridFramePenThickness( 0.5 ), mGridFramePenColor( QColor( 0, 0, 0 ) ), mGridFrameFillColor1( Qt::white ), mGridFrameFillColor2( Qt::black ),
55-
mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true ), mAtlasDriven( false ), mAtlasFixedScale( false ), mAtlasMargin( 0.10 )
45+
: QgsComposerItem( x, y, width, height, composition ), mMapRotation( 0 ), mKeepLayerSet( false )
46+
, mOverviewFrameMapId( -1 ), mOverviewBlendMode( QPainter::CompositionMode_SourceOver ), mOverviewInverted( false ), mOverviewCentered( false )
47+
, mGridEnabled( false ), mGridStyle( Solid )
48+
, mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mGridAnnotationFontColor( QColor( 0, 0, 0 ) )
49+
, mGridAnnotationPrecision( 3 ), mShowGridAnnotation( false ), mGridBlendMode( QPainter::CompositionMode_SourceOver )
50+
, mLeftGridAnnotationPosition( OutsideMapFrame ), mRightGridAnnotationPosition( OutsideMapFrame )
51+
, mTopGridAnnotationPosition( OutsideMapFrame ), mBottomGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 )
52+
, mLeftGridAnnotationDirection( Horizontal ), mRightGridAnnotationDirection( Horizontal ), mTopGridAnnotationDirection( Horizontal )
53+
, mBottomGridAnnotationDirection( Horizontal ), mGridFrameStyle( NoGridFrame ), mGridFrameWidth( 2.0 )
54+
, mGridFramePenThickness( 0.5 ), mGridFramePenColor( QColor( 0, 0, 0 ) ), mGridFrameFillColor1( Qt::white ), mGridFrameFillColor2( Qt::black )
55+
, mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true ), mAtlasDriven( false ), mAtlasFixedScale( false ), mAtlasMargin( 0.10 )
5656
{
5757
mComposition = composition;
5858
mOverviewFrameMapSymbol = 0;
@@ -100,17 +100,17 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w
100100
}
101101

102102
QgsComposerMap::QgsComposerMap( QgsComposition *composition )
103-
: QgsComposerItem( 0, 0, 10, 10, composition ), mMapRotation( 0 ), mKeepLayerSet( false ), mOverviewFrameMapId( -1 ),
104-
mOverviewBlendMode( QPainter::CompositionMode_SourceOver ), mOverviewInverted( false ), mOverviewCentered( false ),
105-
mGridEnabled( false ), mGridStyle( Solid ),
106-
mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mGridAnnotationFontColor( QColor( 0, 0, 0 ) ),
107-
mGridAnnotationPrecision( 3 ), mShowGridAnnotation( false ), mGridBlendMode( QPainter::CompositionMode_SourceOver ),
108-
mLeftGridAnnotationPosition( OutsideMapFrame ), mRightGridAnnotationPosition( OutsideMapFrame ),
109-
mTopGridAnnotationPosition( OutsideMapFrame ), mBottomGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ),
110-
mLeftGridAnnotationDirection( Horizontal ), mRightGridAnnotationDirection( Horizontal ), mTopGridAnnotationDirection( Horizontal ),
111-
mBottomGridAnnotationDirection( Horizontal ), mGridFrameStyle( NoGridFrame ), mGridFrameWidth( 2.0 ), mGridFramePenThickness( 0.5 ),
112-
mGridFramePenColor( QColor( 0, 0, 0 ) ), mGridFrameFillColor1( Qt::white ), mGridFrameFillColor2( Qt::black ),
113-
mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true ), mAtlasDriven( false ), mAtlasFixedScale( false ), mAtlasMargin( 0.10 )
103+
: QgsComposerItem( 0, 0, 10, 10, composition ), mMapRotation( 0 ), mKeepLayerSet( false ), mOverviewFrameMapId( -1 )
104+
, mOverviewBlendMode( QPainter::CompositionMode_SourceOver ), mOverviewInverted( false ), mOverviewCentered( false )
105+
, mGridEnabled( false ), mGridStyle( Solid )
106+
, mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mGridAnnotationFontColor( QColor( 0, 0, 0 ) )
107+
, mGridAnnotationPrecision( 3 ), mShowGridAnnotation( false ), mGridBlendMode( QPainter::CompositionMode_SourceOver )
108+
, mLeftGridAnnotationPosition( OutsideMapFrame ), mRightGridAnnotationPosition( OutsideMapFrame )
109+
, mTopGridAnnotationPosition( OutsideMapFrame ), mBottomGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 )
110+
, mLeftGridAnnotationDirection( Horizontal ), mRightGridAnnotationDirection( Horizontal ), mTopGridAnnotationDirection( Horizontal )
111+
, mBottomGridAnnotationDirection( Horizontal ), mGridFrameStyle( NoGridFrame ), mGridFrameWidth( 2.0 ), mGridFramePenThickness( 0.5 )
112+
, mGridFramePenColor( QColor( 0, 0, 0 ) ), mGridFrameFillColor1( Qt::white ), mGridFrameFillColor2( Qt::black )
113+
, mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true ), mAtlasDriven( false ), mAtlasFixedScale( false ), mAtlasMargin( 0.10 )
114114
{
115115
mOverviewFrameMapSymbol = 0;
116116
mGridLineSymbol = 0;

‎src/core/dxf/qgsdxfpallabeling.cpp

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,25 @@
1919
#include "qgsdxfexport.h"
2020
#include "qgsmaplayerregistry.h"
2121
#include "qgspalgeometry.h"
22+
#include "qgsmapsettings.h"
23+
2224
#include "pal/pointset.h"
2325
#include "pal/labelposition.h"
2426

2527
using namespace pal;
2628

27-
QgsDxfPalLabeling::QgsDxfPalLabeling( QgsDxfExport* dxf, const QgsRectangle& bbox, double scale, QGis::UnitType mapUnits ): QgsPalLabeling(), mDxfExport( dxf )
29+
QgsDxfPalLabeling::QgsDxfPalLabeling( QgsDxfExport* dxf, const QgsRectangle& bbox, double scale, QGis::UnitType mapUnits )
30+
: QgsPalLabeling()
31+
, mDxfExport( dxf )
2832
{
29-
mMapRenderer.setExtent( bbox );
33+
QgsMapSettings settings;
34+
settings.setExtent( bbox );
3035

3136
int dpi = 96;
3237
double factor = 1000 * dpi / scale / 25.4 * QGis::fromUnitToUnitFactor( mapUnits, QGis::Meters );
33-
mMapRenderer.setOutputSize( QSizeF( bbox.width() * factor, bbox.height() * factor ), dpi );
34-
mMapRenderer.setScale( scale );
35-
mMapRenderer.setOutputUnits( QgsMapRenderer::Pixels );
36-
init( &mMapRenderer );
38+
settings.setOutputSize( QSize( bbox.width() * factor, bbox.height() * factor ) );
39+
settings.setOutputDpi( dpi );
40+
init( settings );
3741

3842
mImage = new QImage( 10, 10, QImage::Format_ARGB32_Premultiplied );
3943
mImage->setDotsPerMeterX( 96 / 25.4 * 1000 );

‎src/core/dxf/qgsdxfpallabeling.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ class CORE_EXPORT QgsDxfPalLabeling: public QgsPalLabeling
3535

3636
private:
3737
QgsDxfExport* mDxfExport;
38-
QgsMapRenderer mMapRenderer;
3938
QgsRenderContext mRenderContext;
4039

4140
//only used for render context

‎src/core/qgsdiagramrendererv2.cpp

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,24 @@
1818
#include "diagram/qgspiediagram.h"
1919
#include "diagram/qgshistogramdiagram.h"
2020
#include "qgsrendercontext.h"
21+
2122
#include <QDomElement>
2223
#include <QPainter>
2324

25+
QgsDiagramLayerSettings::QgsDiagramLayerSettings()
26+
: placement( AroundPoint )
27+
, placementFlags( OnLine )
28+
, priority( 5 )
29+
, obstacle( false )
30+
, dist( 0.0 )
31+
, renderer( 0 )
32+
, palLayer( 0 )
33+
, ct( 0 )
34+
, xform( 0 )
35+
, xPosColumn( -1 )
36+
, yPosColumn( -1 )
37+
{
38+
}
2439

2540
QgsDiagramLayerSettings::~QgsDiagramLayerSettings()
2641
{
@@ -254,7 +269,8 @@ void QgsDiagramSettings::writeXML( QDomElement& rendererElem, QDomDocument& doc,
254269
rendererElem.appendChild( categoryElem );
255270
}
256271

257-
QgsDiagramRendererV2::QgsDiagramRendererV2(): mDiagram( 0 )
272+
QgsDiagramRendererV2::QgsDiagramRendererV2()
273+
: mDiagram( 0 )
258274
{
259275
}
260276

‎src/core/qgsdiagramrendererv2.h

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,7 @@ class CORE_EXPORT QgsDiagramLayerSettings
5858
MapOrientation = 8
5959
};
6060

61-
QgsDiagramLayerSettings()
62-
: placement( AroundPoint )
63-
, placementFlags( OnLine )
64-
, priority( 5 )
65-
, obstacle( false )
66-
, dist( 0.0 )
67-
, renderer( 0 )
68-
, palLayer( 0 )
69-
, ct( 0 )
70-
, xform( 0 )
71-
, xPosColumn( -1 )
72-
, yPosColumn( -1 )
73-
{
74-
}
61+
QgsDiagramLayerSettings();
7562

7663
~QgsDiagramLayerSettings();
7764

‎src/core/qgsexpression.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2220,6 +2220,8 @@ int QgsExpression::NodeBinaryOperator::precedence() const
22202220
case boConcat:
22212221
return 7;
22222222
}
2223+
Q_ASSERT( 0 && "unexpected binary operator" );
2224+
return -1;
22232225
}
22242226

22252227
QString QgsExpression::NodeBinaryOperator::dump() const

‎src/core/qgsfontutils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ bool QgsFontUtils::loadStandardTestFonts( QStringList loadstyles )
241241
int fontID = QFontDatabase::addApplicationFont( fontPath );
242242
loaded = ( fontID != -1 );
243243
fontsLoaded = ( fontsLoaded || loaded );
244-
QgsDebugMsg( QString( "Test font '%1' %2 from filesystem" )
245-
.arg( familyStyle ).arg( loaded ? "loaded" : "FAILED to load" ) );
244+
QgsDebugMsg( QString( "Test font '%1' %2 from filesystem [%3]" )
245+
.arg( familyStyle ).arg( loaded ? "loaded" : "FAILED to load" ).arg( fontPath ) );
246246
}
247247
else
248248
{

‎src/core/qgsmaprendererjob.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -649,14 +649,14 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin
649649
}
650650
}
651651

652-
/*
652+
#if 0
653653
// TODO: split extent
654654
if ( split )
655655
{
656656
mRenderContext.setExtent( r2 );
657657
ml->draw( mRenderContext );
658-
}*/
659-
658+
}
659+
#endif
660660
} // while (li.hasPrevious())
661661

662662
return layerJobs;

‎src/core/qgsmapsettings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class CORE_EXPORT QgsMapSettings
6161
ForceVectorOutput = 0x04,
6262
UseAdvancedEffects = 0x08,
6363
DrawLabeling = 0x10
64-
// TODO: ignore scale-based visibiity (overview)
64+
// TODO: ignore scale-based visibility (overview)
6565
};
6666
Q_DECLARE_FLAGS( Flags, Flag )
6767

‎src/core/qgsrenderchecker.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
QgsRenderChecker::QgsRenderChecker( ) :
3131
mReport( "" ),
3232
mMatchTarget( 0 ),
33-
mpMapRenderer( NULL ),
3433
mElapsedTime( 0 ),
3534
mRenderedImageFile( "" ),
3635
mExpectedImageFile( "" ),
@@ -39,7 +38,6 @@ QgsRenderChecker::QgsRenderChecker( ) :
3938
mElapsedTimeTarget( 0 ),
4039
mControlPathPrefix( "" )
4140
{
42-
4341
}
4442

4543
QString QgsRenderChecker::controlImagePath() const

‎src/core/qgsrenderchecker.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ class CORE_EXPORT QgsRenderChecker
121121

122122
QString mReport;
123123
unsigned int mMatchTarget;
124-
QgsMapRenderer * mpMapRenderer;
125124
int mElapsedTime;
126125
QString mRenderedImageFile;
127126
QString mExpectedImageFile;

0 commit comments

Comments
 (0)
Please sign in to comment.