Followup 850171, fix build

qgis · Dec 30, 2016 · 2daaff3 · 2daaff3
1 parent 850171c
commit 2daaff3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h
@@ -20,13 +20,10 @@
 #include <QVariant>
 #include <QVector>
 #include <QSharedDataPointer>
+#include "qgsfield_p.h"
 
 typedef QList<int> QgsAttributeList;
 
-class QgsExpression;
-class QgsFieldPrivate;
-class QgsFieldsPrivate;
-
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
  * full unit tests in testqgsfield.cpp.

diff --git a/src/core/qgsfield_p.h b/src/core/qgsfield_p.h
@@ -28,6 +28,7 @@
 //
 
 #include "qgsfieldconstraints.h"
+#include "qgseditorwidgetsetup.h"
 #include <QString>
 #include <QVariant>
 #include <QSharedData>

diff --git a/src/core/qgsfields.cpp b/src/core/qgsfields.cpp
@@ -41,6 +41,9 @@ QgsFields& QgsFields::operator =( const QgsFields & other )
   return *this;
 }
 
+QgsFields::~QgsFields()
+{}
+
 void QgsFields::clear()
 {
   d->fields.clear();

diff --git a/src/core/qgsfields.h b/src/core/qgsfields.h
@@ -18,6 +18,8 @@
 
 #include "qgsfield.h"
 
+class QgsFieldsPrivate;
+
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
  * full unit tests in testqgsfields.cpp.
@@ -80,7 +82,7 @@ class CORE_EXPORT QgsFields
      */
     QgsFields& operator =( const QgsFields& other );
 
-    virtual ~QgsFields() = default;
+    virtual ~QgsFields();
 
     //! Remove all fields
     void clear();