Skip to content

Commit 7f97787

Browse files
author
jef
committed
fix build with Qt 4.4
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14030 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 1767322 commit 7f97787

File tree

4 files changed

+10
-0
lines changed

4 files changed

+10
-0
lines changed

src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,11 @@ void QgsGraduatedSymbolRendererV2::stopRender( QgsRenderContext& context )
186186
it->symbol()->startRender( context );
187187

188188
// cleanup mTempSymbols
189+
#if QT_VERSION < 0x40600
190+
QMap<QgsSymbolV2*, QgsSymbolV2*>::iterator it2 = mTempSymbols.begin();
191+
#else
189192
QHash<QgsSymbolV2*, QgsSymbolV2*>::iterator it2 = mTempSymbols.begin();
193+
#endif
190194
for ( ; it2 != mTempSymbols.end(); ++it2 )
191195
{
192196
it2.value()->stopRender( context );

src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h

+4
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,11 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
131131
int mRotationFieldIdx, mSizeScaleFieldIdx;
132132

133133
//! temporary symbols, used for data-defined rotation and scaling
134+
#if QT_VERSION < 0x40600
135+
QMap<QgsSymbolV2*, QgsSymbolV2*> mTempSymbols;
136+
#else
134137
QHash<QgsSymbolV2*, QgsSymbolV2*> mTempSymbols;
138+
#endif
135139

136140
QgsSymbolV2* symbolForValue( double value );
137141
};

src/providers/wfs/qgswfsdata.h

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <list>
2626
#include <set>
2727
#include <stack>
28+
#include <QPair>
2829
class QgsRectangle;
2930
class QgsCoordinateReferenceSystem;
3031

src/providers/wfs/qgswfsprovider.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <QFile>
3636
#include <QUrl>
3737
#include <QWidget>
38+
#include <QPair>
3839
#include <cfloat>
3940

4041
static const QString TEXT_PROVIDER_KEY = "WFS";

0 commit comments

Comments
 (0)