sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix windows build

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-11-22 11:36:05 +01:00
parent 802a4acdba
commit f273edb955
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/main.cpp
View File

@ -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.

2
src/core/qgsmaptopixelgeometrysimplifier.cpp
View File

@ -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;

2
src/core/symbology-ng/qgsrendererv2.h
View File

@ -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;