Fix build

qgis · May 20, 2021 · ec50960 · ec50960
1 parent 480e36e
commit ec50960
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 4 deletions.
diff --git a/src/core/browser/qgsdatacollectionitem.cpp b/src/core/browser/qgsdatacollectionitem.cpp
@@ -21,6 +21,7 @@
 #include "qgsprovidermetadata.h"
 #include "qgsproviderregistry.h"
 #include "qgsabstractdatabaseproviderconnection.h"
+#include <QRegularExpression>
 
 QgsDataCollectionItem::QgsDataCollectionItem( QgsDataItem *parent,
     const QString &name,

diff --git a/src/core/browser/qgszipitem.cpp b/src/core/browser/qgszipitem.cpp
@@ -23,6 +23,7 @@
 
 #include <cpl_vsi.h>
 #include <cpl_string.h>
+#include <mutex>
 
 QIcon QgsZipItem::iconZip()
 {

diff --git a/src/providers/arcgisrest/qgsarcgisrestdataitems.cpp b/src/providers/arcgisrest/qgsarcgisrestdataitems.cpp
@@ -18,6 +18,7 @@
 #include "qgsarcgisrestutils.h"
 #include "qgsarcgisrestquery.h"
 #include "qgsarcgisportalutils.h"
+#include "qgsdataprovider.h"
 
 #ifdef HAVE_GUI
 #include "qgsarcgisrestsourceselect.h"

diff --git a/src/providers/grass/qgsgrassprovidermodule.h b/src/providers/grass/qgsgrassprovidermodule.h
@@ -19,6 +19,9 @@
 #include "qgsdataitem.h"
 #include "qgsgrass.h"
 #include "qgsgrassimport.h"
+#include "qgsdirectoryitem.h"
+#include "qgslayeritem.h"
+#include "qgsdatacollectionitem.h"
 
 class QTextEdit;
 class QProgressBar;

diff --git a/src/providers/hana/qgshanadataitems.cpp b/src/providers/hana/qgshanadataitems.cpp
@@ -30,6 +30,7 @@
 #include "qgsnewnamedialog.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectorlayerexporter.h"
+#include "qgsfieldsitem.h"
 
 #include <QMessageBox>
 #include <climits>

diff --git a/src/providers/hana/qgshanadataitems.h b/src/providers/hana/qgshanadataitems.h
@@ -20,6 +20,10 @@
 #include "qgsconnectionsitem.h"
 #include "qgsdataitemprovider.h"
 #include "qgshanatablemodel.h"
+#include "qgsdatabaseschemaitem.h"
+#include "qgsdatacollectionitem.h"
+#include "qgslayeritem.h"
+#include "qgsdataprovider.h"
 
 class QgsHanaRootItem;
 class QgsHanaConnectionItem;

diff --git a/src/providers/oracle/qgsoracledataitems.h b/src/providers/oracle/qgsoracledataitems.h
@@ -25,6 +25,7 @@
 #include "qgsoraclesourceselect.h"
 #include "qgsmimedatautils.h"
 #include "qgsdataitemprovider.h"
+#include "qgslayeritem.h"
 
 class QSqlDatabase;
 

diff --git a/src/providers/oracle/qgsoraclesourceselect.cpp b/src/providers/oracle/qgsoraclesourceselect.cpp
@@ -31,6 +31,7 @@ email                : jef at norbit dot de
 #include "qgssettings.h"
 #include "qgsproxyprogresstask.h"
 #include "qgsgui.h"
+#include "qgsiconutils.h"
 
 #include <QFileDialog>
 #include <QInputDialog>
@@ -67,7 +68,7 @@ QWidget *QgsOracleSourceSelectDelegate::createEditor( QWidget *parent, const QSt
             QgsWkbTypes::NoGeometry
           } )
     {
-      cb->addItem( QgsLayerItem::iconForWkbType( type ), QgsWkbTypes::translatedDisplayString( type ), type );
+      cb->addItem( QgsIconUtils::iconForWkbType( type ), QgsWkbTypes::translatedDisplayString( type ), type );
     }
     return cb;
   }
@@ -142,7 +143,7 @@ void QgsOracleSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItem
     {
       QgsWkbTypes::Type type = static_cast< QgsWkbTypes::Type >( cb->currentData().toInt() );
 
-      model->setData( index, QgsLayerItem::iconForWkbType( type ), Qt::DecorationRole );
+      model->setData( index, QgsIconUtils::iconForWkbType( type ), Qt::DecorationRole );
       model->setData( index, type != QgsWkbTypes::Unknown ? QgsWkbTypes::translatedDisplayString( type ) : tr( "Select…" ) );
       model->setData( index, type, Qt::UserRole + 2 );
     }

diff --git a/src/providers/oracle/qgsoracletablemodel.cpp b/src/providers/oracle/qgsoracletablemodel.cpp
@@ -18,6 +18,7 @@
 #include "qgsoracletablemodel.h"
 #include "qgslogger.h"
 #include "qgsapplication.h"
+#include "qgsiconutils.h"
 
 QgsOracleTableModel::QgsOracleTableModel()
 {
@@ -69,7 +70,7 @@ void QgsOracleTableModel::addTableEntry( const QgsOracleLayerProperty &layerProp
 
     QStandardItem *ownerNameItem = new QStandardItem( layerProperty.ownerName );
     QStandardItem *typeItem = new QStandardItem(
-      QgsLayerItem::iconForWkbType( wkbType ),
+      QgsIconUtils::iconForWkbType( wkbType ),
       wkbType == QgsWkbTypes::Unknown ? tr( "Select…" ) : QgsWkbTypes::translatedDisplayString( wkbType ) );
     typeItem->setData( wkbType == QgsWkbTypes::Unknown, Qt::UserRole + 1 );
     typeItem->setData( wkbType, Qt::UserRole + 2 );

diff --git a/src/providers/postgres/qgspgtablemodel.cpp b/src/providers/postgres/qgspgtablemodel.cpp
@@ -21,7 +21,7 @@
 #include "qgssettings.h"
 #include "qgsproject.h"
 #include "qgsiconutils.h"
-
+#include <QRegularExpression>
 #include <climits>
 
 QgsPgTableModel::QgsPgTableModel()

diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -67,6 +67,8 @@
 #include <QStringBuilder>
 #include <QUrlQuery>
 #include <QJsonArray>
+#include <QRegularExpression>
+#include <QRegularExpressionMatch>
 
 #include <ogr_api.h>