Skip to content
Permalink
Browse files

Do not #include QtConcurrent when using map renderer jobs C++ API

This way C++ apps using the API do not need to add QtConcurrent to their build
  • Loading branch information
wonder-sk committed Jun 8, 2017
1 parent 866bfc3 commit c340e37e8860b67b70c5455009ff1f0f841368f0
@@ -24,6 +24,8 @@
#include "qgsrenderer.h"
#include "qgsmaplayerlistutils.h"

#include <QtConcurrentRun>

QgsMapRendererCustomPainterJob::QgsMapRendererCustomPainterJob( const QgsMapSettings &settings, QPainter *painter )
: QgsMapRendererJob( settings )
, mPainter( painter )
@@ -19,7 +19,6 @@
#include "qgis_core.h"
#include "qgis_sip.h"
#include "qgis.h"
#include <QtConcurrentRun>
#include <QFutureWatcher>
#include <QImage>
#include <QPainter>
@@ -24,6 +24,7 @@
#include "qgsmaplayerlistutils.h"

#include <QtConcurrentMap>
#include <QtConcurrentRun>

QgsMapRendererParallelJob::QgsMapRendererParallelJob( const QgsMapSettings &settings )
: QgsMapRendererQImageJob( settings )
@@ -50,8 +50,7 @@ QgsMapSettings::QgsMapSettings()
, mMapUnitsPerPixel( 1 )
, mScale( 1 )
{
// set default map units - we use WGS 84 thus use degrees
mScaleCalculator.setMapUnits( QgsUnitTypes::DistanceDegrees );
mScaleCalculator.setMapUnits( QgsUnitTypes::DistanceUnknownUnit );

updateDerived();
}

0 comments on commit c340e37

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