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
qgis · Jun 8, 2017 · c340e37 · c340e37
1 parent 866bfc3
commit c340e37
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/src/core/qgsmaprenderercustompainterjob.cpp b/src/core/qgsmaprenderercustompainterjob.cpp
@@ -24,6 +24,8 @@
 #include "qgsrenderer.h"
 #include "qgsmaplayerlistutils.h"
 
+#include <QtConcurrentRun>
+
 QgsMapRendererCustomPainterJob::QgsMapRendererCustomPainterJob( const QgsMapSettings &settings, QPainter *painter )
   : QgsMapRendererJob( settings )
   , mPainter( painter )

diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h
@@ -19,7 +19,6 @@
 #include "qgis_core.h"
 #include "qgis_sip.h"
 #include "qgis.h"
-#include <QtConcurrentRun>
 #include <QFutureWatcher>
 #include <QImage>
 #include <QPainter>

diff --git a/src/core/qgsmaprendererparalleljob.cpp b/src/core/qgsmaprendererparalleljob.cpp
@@ -24,6 +24,7 @@
 #include "qgsmaplayerlistutils.h"
 
 #include <QtConcurrentMap>
+#include <QtConcurrentRun>
 
 QgsMapRendererParallelJob::QgsMapRendererParallelJob( const QgsMapSettings &settings )
   : QgsMapRendererQImageJob( settings )

diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp
@@ -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();
 }