fix build with Qt 4.4

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14030 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 8, 2010 · 7f97787 · 7f97787
1 parent 1767322
commit 7f97787
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -186,7 +186,11 @@ void QgsGraduatedSymbolRendererV2::stopRender( QgsRenderContext& context )
     it->symbol()->startRender( context );
 
   // cleanup mTempSymbols
+#if QT_VERSION < 0x40600
+  QMap<QgsSymbolV2*, QgsSymbolV2*>::iterator it2 = mTempSymbols.begin();
+#else
   QHash<QgsSymbolV2*, QgsSymbolV2*>::iterator it2 = mTempSymbols.begin();
+#endif
   for ( ; it2 != mTempSymbols.end(); ++it2 )
   {
     it2.value()->stopRender( context );

diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
@@ -131,7 +131,11 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
     int mRotationFieldIdx, mSizeScaleFieldIdx;
 
     //! temporary symbols, used for data-defined rotation and scaling
+#if QT_VERSION < 0x40600
+    QMap<QgsSymbolV2*, QgsSymbolV2*> mTempSymbols;
+#else
     QHash<QgsSymbolV2*, QgsSymbolV2*> mTempSymbols;
+#endif
 
     QgsSymbolV2* symbolForValue( double value );
 };

diff --git a/src/providers/wfs/qgswfsdata.h b/src/providers/wfs/qgswfsdata.h
@@ -25,6 +25,7 @@
 #include <list>
 #include <set>
 #include <stack>
+#include <QPair>
 class QgsRectangle;
 class QgsCoordinateReferenceSystem;
 

diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp
@@ -35,6 +35,7 @@
 #include <QFile>
 #include <QUrl>
 #include <QWidget>
+#include <QPair>
 #include <cfloat>
 
 static const QString TEXT_PROVIDER_KEY = "WFS";