Fix build

qgis · Jul 18, 2016 · 18e4d52 · 18e4d52
1 parent 1444398
commit 18e4d52
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 2 deletions.
diff --git a/src/core/pal/feature.h b/src/core/pal/feature.h
@@ -33,6 +33,7 @@
 #include "pointset.h"
 #include "labelposition.h" // for LabelPosition enum
 #include "qgslabelfeature.h"
+#include "rtree.hpp"
 #include <iostream>
 #include <fstream>
 #include <cmath>

diff --git a/src/core/pal/layer.h b/src/core/pal/layer.h
@@ -31,6 +31,7 @@
 #define PAL_LAYER_H_
 
 #include "pal.h" // for LineArrangementFlags enum
+#include "rtree.hpp"
 #include <QMutex>
 #include <QLinkedList>
 #include <QHash>

diff --git a/src/core/pal/pointset.h b/src/core/pal/pointset.h
@@ -35,8 +35,6 @@
 #include <QLinkedList>
 #include <geos_c.h>
 
-class RTree;
-
 namespace pal
 {
 

diff --git a/src/core/pal/problem.h b/src/core/pal/problem.h
@@ -32,6 +32,7 @@
 
 #include <list>
 #include <QList>
+#include "rtree.hpp"
 
 namespace pal
 {

diff --git a/src/core/qgslabelsearchtree.h b/src/core/qgslabelsearchtree.h
@@ -24,6 +24,7 @@
 #include <pointset.h>
 #include <labelposition.h>
 #include "qgsmaprenderer.h"
+#include "rtree.hpp"
 
 class QgsPoint;
 

diff --git a/src/providers/postgres/qgspostgresfeatureiterator.h b/src/providers/postgres/qgspostgresfeatureiterator.h
@@ -18,6 +18,7 @@
 #include "qgsfeatureiterator.h"
 
 #include <QQueue>
+#include <QSharedPointer>
 
 #include "qgspostgresprovider.h"
 

diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
@@ -23,6 +23,7 @@
 #include "qgsvectorlayerimport.h"
 #include "qgspostgresconn.h"
 #include "qgsfield.h"
+#include <QSharedPointer>
 
 class QgsFeature;
 class QgsField;