Navigation Menu

Skip to content

Commit

Permalink
Fixes for WITH_GUI=ON static builds
Browse files Browse the repository at this point in the history
  • Loading branch information
@nirvn @github-actions
nirvn authored and github-actions[bot] committed Oct 31, 2021
1 parent 6c59725 commit 526e54a
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 19 deletions.
6 changes: 6 additions & 0 deletions src/providers/arcgisrest/CMakeLists.txt
View file
Expand Up @@ -44,7 +44,13 @@ if (WITH_GUI)
endif()

add_library(provider_arcgisfeatureserver_gui_a STATIC ${AFS_GUI_SRCS} ${AFS_UIS_H})

# require c++17
target_compile_features(provider_arcgisfeatureserver_gui_a PRIVATE cxx_std_17)

target_link_libraries(provider_arcgisfeatureserver_a
qgis_gui
)
target_link_libraries(provider_arcgisfeatureserver_gui_a
qgis_gui
)
Expand Down
6 changes: 3 additions & 3 deletions src/providers/arcgisrest/qgsarcgisrestprovidergui.cpp
View file
Expand Up @@ -71,21 +71,21 @@ QgsArcGisRestProviderGuiMetadata::QgsArcGisRestProviderGuiMetadata()
{
}

QList<QgsDataItemGuiProvider *> QgsArcGisRestProviderGuiMetadata::dataItemGuiProviders() override
QList<QgsDataItemGuiProvider *> QgsArcGisRestProviderGuiMetadata::dataItemGuiProviders()
{
QList<QgsDataItemGuiProvider *> providers;
providers << new QgsArcGisRestDataItemGuiProvider();
return providers;
}

QList<QgsSourceSelectProvider *> QgsArcGisRestProviderGuiMetadata::sourceSelectProviders() override
QList<QgsSourceSelectProvider *> QgsArcGisRestProviderGuiMetadata::sourceSelectProviders()
{
QList<QgsSourceSelectProvider *> providers;
providers << new QgsArcGisRestSourceSelectProvider;
return providers;
}

QList<QgsProviderSourceWidgetProvider *> QgsArcGisRestProviderGuiMetadata::sourceWidgetProviders() override
QList<QgsProviderSourceWidgetProvider *> QgsArcGisRestProviderGuiMetadata::sourceWidgetProviders()
{
QList<QgsProviderSourceWidgetProvider *> providers;
providers << new QgsArcGisRestSourceWidgetProvider();
Expand Down
7 changes: 5 additions & 2 deletions src/providers/spatialite/CMakeLists.txt
View file
Expand Up @@ -58,6 +58,9 @@ if (WITH_GUI)
${CMAKE_BINARY_DIR}/src/providers/spatialite
)

target_link_libraries(provider_spatialite_a
qgis_gui
)
target_link_libraries(provider_spatialite_gui_a
qgis_gui
)
Expand All @@ -82,7 +85,7 @@ if (FORCE_STATIC_LIBS)
install (TARGETS provider_spatialite_gui_a ARCHIVE DESTINATION ${QGIS_PLUGIN_DIR})
endif()
else()
add_library(provider_spatialite MODULE ${SPATIALITE_SRCS} ${SPATIALITE_GUI_SRCS})
add_library(provider_spatialite MODULE ${SPATIALITE_SRCS} ${SPATIALITE_GUI_SRCS} ${SPATIALITE_UIS_H})

# require c++17
target_compile_features(provider_spatialite PRIVATE cxx_std_17)
Expand All @@ -95,7 +98,7 @@ else()
)

if (WITH_GUI)
target_link_libraries (provider_spatialite
target_link_libraries(provider_spatialite
qgis_gui
)
add_dependencies(provider_spatialite ui)
Expand Down
6 changes: 4 additions & 2 deletions src/providers/spatialite/qgsspatialiteprovidergui.cpp
View file
Expand Up @@ -13,6 +13,8 @@
* *
***************************************************************************/

#include "qgsspatialiteprovidergui.h"

#include "qgsapplication.h"
#include "qgsproviderguimetadata.h"
#include "qgssourceselectprovider.h"
Expand Down Expand Up @@ -44,14 +46,14 @@ QgsSpatiaLiteProviderGuiMetadata::QgsSpatiaLiteProviderGuiMetadata()
{
}

QList<QgsSourceSelectProvider *> QgsSpatiaLiteProviderGuiMetadata::sourceSelectProviders() override
QList<QgsSourceSelectProvider *> QgsSpatiaLiteProviderGuiMetadata::sourceSelectProviders()
{
QList<QgsSourceSelectProvider *> providers;
providers << new QgsSpatialiteSourceSelectProvider;
return providers;
}

QList<QgsDataItemGuiProvider *> QgsSpatiaLiteProviderGuiMetadata::dataItemGuiProviders() override
QList<QgsDataItemGuiProvider *> QgsSpatiaLiteProviderGuiMetadata::dataItemGuiProviders()
{
return QList<QgsDataItemGuiProvider *>()
<< new QgsSpatiaLiteDataItemGuiProvider;
Expand Down
2 changes: 2 additions & 0 deletions src/providers/spatialite/qgsspatialitesourceselect.h
View file
Expand Up @@ -16,7 +16,9 @@
***************************************************************************/
#ifndef QGSSPATIALITESOURCESELECT_H
#define QGSSPATIALITESOURCESELECT_H

#include "ui_qgsdbsourceselectbase.h"

#include "qgsguiutils.h"
#include "qgsdbfilterproxymodel.h"
#include "qgsspatialitetablemodel.h"
Expand Down
14 changes: 6 additions & 8 deletions src/providers/virtual/qgsvirtuallayerprovider.cpp
View file
Expand Up @@ -20,8 +20,6 @@ extern "C"
#include <spatialite.h>
}

#include <QUrl>

#include <stdexcept>

#include "qgsvirtuallayerprovider.h"
Expand All @@ -30,23 +28,23 @@ extern "C"
#include "qgsvectorlayer.h"
#include "qgsproject.h"
#include "qgslogger.h"
#include "qgsapplication.h"

#include "qgsvirtuallayerprovider.h"
#include "qgsvirtuallayersqlitemodule.h"
#include "qgsvirtuallayerqueryparser.h"

const QString VIRTUAL_LAYER_KEY = QStringLiteral( "virtual" );
const QString VIRTUAL_LAYER_DESCRIPTION = QStringLiteral( "Virtual layer data provider" );
#include <QUrl>

const QString VIRTUAL_LAYER_QUERY_VIEW = QStringLiteral( "_query" );
const QString QgsVirtualLayerProvider::VIRTUAL_LAYER_KEY = QStringLiteral( "virtual" );
const QString QgsVirtualLayerProvider::VIRTUAL_LAYER_DESCRIPTION = QStringLiteral( "Virtual layer data provider" );
const QString QgsVirtualLayerProvider::VIRTUAL_LAYER_QUERY_VIEW = QStringLiteral( "_query" );

static QString quotedColumn( QString name )
{
return "\"" + name.replace( QLatin1String( "\"" ), QLatin1String( "\"\"" ) ) + "\"";
}

#define PROVIDER_ERROR( msg ) do { mError = QgsError( msg, VIRTUAL_LAYER_KEY ); QgsDebugMsg( msg ); } while(0)
#define PROVIDER_ERROR( msg ) do { mError = QgsError( msg, QgsVirtualLayerProvider::VIRTUAL_LAYER_KEY ); QgsDebugMsg( msg ); } while(0)


QgsVirtualLayerProvider::QgsVirtualLayerProvider( QString const &uri,
Expand Down Expand Up @@ -673,7 +671,7 @@ QgsVirtualLayerProvider *QgsVirtualLayerProviderMetadata::createProvider(
}

QgsVirtualLayerProviderMetadata::QgsVirtualLayerProviderMetadata():
QgsProviderMetadata( VIRTUAL_LAYER_KEY, VIRTUAL_LAYER_DESCRIPTION )
QgsProviderMetadata( QgsVirtualLayerProvider::VIRTUAL_LAYER_KEY, QgsVirtualLayerProvider::VIRTUAL_LAYER_DESCRIPTION )
{
}

Expand Down
4 changes: 4 additions & 0 deletions src/providers/virtual/qgsvirtuallayerprovider.h
View file
Expand Up @@ -33,6 +33,10 @@ class QgsVirtualLayerProvider final: public QgsVectorDataProvider
Q_OBJECT
public:

static const QString VIRTUAL_LAYER_KEY;
static const QString VIRTUAL_LAYER_DESCRIPTION;
static const QString VIRTUAL_LAYER_QUERY_VIEW;

/**
* Constructor of the vector provider
* \param uri uniform resource locator (URI) for a dataset
Expand Down
5 changes: 4 additions & 1 deletion src/providers/virtual/qgsvirtuallayerprovidergui.cpp
View file
Expand Up @@ -14,7 +14,10 @@
***************************************************************************/

#include "qgsvirtuallayerprovidergui.h"

#include "qgsapplication.h"
#include "qgssourceselectprovider.h"
#include "qgsvirtuallayerprovider.h"
#include "qgsvirtuallayersourceselect.h"

//! Provider for virtual layers source select
Expand All @@ -35,7 +38,7 @@ class QgsVirtualSourceSelectProvider : public QgsSourceSelectProvider


QgsVirtualLayerProviderGuiMetadata::QgsVirtualLayerProviderGuiMetadata()
: QgsProviderGuiMetadata( VIRTUAL_LAYER_KEY )
: QgsProviderGuiMetadata( QgsVirtualLayerProvider::VIRTUAL_LAYER_KEY )
{
}

Expand Down
3 changes: 3 additions & 0 deletions src/providers/wfs/CMakeLists.txt
View file
Expand Up @@ -72,6 +72,9 @@ if (WITH_GUI)
${CMAKE_BINARY_DIR}/src/providers/wfs
)

target_link_libraries(provider_wfs_a
qgis_gui
)
target_link_libraries(provider_wfs_gui_a
qgis_gui
)
Expand Down
8 changes: 5 additions & 3 deletions src/providers/wfs/qgswfsprovidergui.cpp
View file
Expand Up @@ -13,6 +13,8 @@
* *
***************************************************************************/

#include "qgswfsprovidergui.h"

#include "qgswfsprovider.h"
#include "qgswfsdataitemguiprovider.h"
#include "qgswfssourceselect.h"
Expand Down Expand Up @@ -65,20 +67,20 @@ QgsWfsProviderGuiMetadata::QgsWfsProviderGuiMetadata()
{
}

QList<QgsSourceSelectProvider *> QgsWfsProviderGuiMetadata::sourceSelectProviders() override
QList<QgsSourceSelectProvider *> QgsWfsProviderGuiMetadata::sourceSelectProviders()
{
QList<QgsSourceSelectProvider *> providers;
providers << new QgsWfsSourceSelectProvider;
return providers;
}

QList<QgsDataItemGuiProvider *> QgsWfsProviderGuiMetadata::dataItemGuiProviders() override
QList<QgsDataItemGuiProvider *> QgsWfsProviderGuiMetadata::dataItemGuiProviders()
{
return QList<QgsDataItemGuiProvider *>()
<< new QgsWfsDataItemGuiProvider;
}

QList<QgsSubsetStringEditorProvider *> QgsWfsProviderGuiMetadata::subsetStringEditorProviders() override
QList<QgsSubsetStringEditorProvider *> QgsWfsProviderGuiMetadata::subsetStringEditorProviders()
{
return QList<QgsSubsetStringEditorProvider *>()
<< new QgsWfsSubsetStringEditorProvider;
Expand Down

0 comments on commit 526e54a

Please sign in to comment.