fix windows build

jef-n · jef-n · commit f273edb955ab · 2014-11-22T11:36:15.000+01:00
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -29,6 +29,9 @@
 #include <QString>
 #include <QStringList>
 #include <QStyle>
+#if QT_VERSION < 0x050000
+#include <QPlastiqueStyle>
+#endif
 #include <QTranslator>
 #include <QImageReader>
 #include <QMessageBox>
@@ -753,8 +756,10 @@ int main( int argc, char *argv[] )
   if ( !style.isNull() )
     QApplication::setStyle( style );
 #ifdef Q_WS_WIN
+#if QT_VERSION < 0x050000
   else
     QApplication::setStyle( new QPlastiqueStyle );
+#endif
 #endif
 
   /* Translation file for QGIS.
diff --git a/src/core/qgsmaptopixelgeometrysimplifier.cpp b/src/core/qgsmaptopixelgeometrysimplifier.cpp
@@ -275,7 +275,7 @@ bool QgsMapToPixelSimplifier::simplifyWkbGeometry(
         // approximate the geometry's shape by its bounding box
         // (rect for linear ring / one segment for line string)
         unsigned char* targetTempWkb = targetWkb;
-        int targetWkbTempSize = targetWkbSize;
+        size_t targetWkbTempSize = targetWkbSize;
 
         sourceWkb = sourcePrevWkb;
         targetWkb = targetPrevWkb;
diff --git a/src/core/symbology-ng/qgsrendererv2.h b/src/core/symbology-ng/qgsrendererv2.h
@@ -18,6 +18,7 @@
 
 #include "qgis.h"
 #include "qgsrectangle.h"
+#include "qgsrendercontext.h"
 
 #include <QList>
 #include <QString>
@@ -28,7 +29,6 @@
 #include <QDomElement>
 
 class QgsSymbolV2;
-class QgsRenderContext;
 class QgsFeature;
 class QgsFields;
 class QgsVectorLayer;
