fix build without GUI

qgis · Oct 22, 2018 · 225c922 · 225c922
1 parent dfb28fe
commit 225c922
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp
@@ -557,6 +557,7 @@ QgsMssqlLayerItem::QgsMssqlLayerItem( QgsDataItem *parent, const QString &name,
   setState( Populated );
 }
 
+#ifdef HAVE_GUI
 QList<QAction *> QgsMssqlLayerItem::actions( QWidget *actionParent )
 {
   QgsMssqlConnectionItem *connItem = qobject_cast<QgsMssqlConnectionItem *>( parent() ? parent()->parent() : nullptr );
@@ -610,6 +611,7 @@ QList<QAction *> QgsMssqlLayerItem::actions( QWidget *actionParent )
   lst.append( actionTruncateLayer );
   return lst;
 }
+#endif
 
 QgsMssqlLayerItem *QgsMssqlLayerItem::createClone()
 {
@@ -658,6 +660,7 @@ QVector<QgsDataItem *> QgsMssqlSchemaItem::createChildren()
   return QVector<QgsDataItem *>();
 }
 
+#ifdef HAVE_GUI
 QList<QAction *> QgsMssqlSchemaItem::actions( QWidget *parent )
 {
   QList<QAction *> lst;
@@ -672,6 +675,7 @@ QList<QAction *> QgsMssqlSchemaItem::actions( QWidget *parent )
 
   return lst;
 }
+#endif
 
 void QgsMssqlSchemaItem::addLayers( QgsDataItem *newLayers )
 {

diff --git a/src/providers/ogr/qgsgeopackagedataitems.cpp b/src/providers/ogr/qgsgeopackagedataitems.cpp
@@ -13,6 +13,11 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <QAction>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QInputDialog>
+
 #include <sqlite3.h>
 
 #include "qgssqliteutils.h"
@@ -27,18 +32,13 @@
 #include "qgsogrdataitems.h"
 #ifdef HAVE_GUI
 #include "qgsnewgeopackagelayerdialog.h"
-#include "qgsproxyprogresstask.h"
 #endif
 #include "qgsmessageoutput.h"
 #include "qgsvectorlayerexporter.h"
 #include "qgsgeopackagerasterwritertask.h"
 #include "qgstaskmanager.h"
 #include "qgsproviderregistry.h"
-
+#include "qgsproxyprogresstask.h"
-#include <QAction>
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QInputDialog>
 
 QGISEXTERN bool deleteLayer( const QString &uri, const QString &errCause );