Skip to content
Permalink
Browse files

fix windows build

  • Loading branch information
jef-n committed Nov 22, 2014
1 parent 802a4ac commit f273edb955abef1f3139c1c5edab681520854e58
Showing with 7 additions and 2 deletions.
  1. +5 −0 src/app/main.cpp
  2. +1 −1 src/core/qgsmaptopixelgeometrysimplifier.cpp
  3. +1 −1 src/core/symbology-ng/qgsrendererv2.h
@@ -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.
@@ -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;
@@ -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;

0 comments on commit f273edb

Please sign in to comment.
You can’t perform that action at this time.