sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix msvc build

Browse Source
This commit is contained in:
Juergen E. Fischer 2021-05-10 00:55:06 +02:00 committed by Nyall Dawson
parent 15d4e877b1
commit f616be29d3
6 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/mdal/frmts/mdal_dynamic_driver.cpp vendored Executable file → Normal file
View File

@ -6,7 +6,7 @@
#include "mdal_dynamic_driver.hpp"
#include "mdal_logger.hpp"
#if not defined (WIN32)
#if !defined(WIN32)
#include <dlfcn.h>
#endif
#include <string.h>

1
python/core/auto_generated/settings/qgssettingsregistrycore.sip.in
View File

@ -10,6 +10,7 @@
class QgsSettingsRegistryCore : QgsSettingsRegistry
{
%Docstring(signature="appended")

2
src/3d/qgspointcloudlayerchunkloader_p.cpp
View File

@ -209,7 +209,7 @@ QgsAABB nodeBoundsToAABB( QgsPointCloudDataBounds nodeBounds, QgsVector3D offset
extentMin3D = coordinateTransform.transform( extentMin3D );
extentMax3D = coordinateTransform.transform( extentMax3D );
}
catch ( QgsCsException &e )
catch ( QgsCsException & )
{
QgsDebugMsg( QStringLiteral( "Error transforming node bounds coordinate" ) );
}

6
src/3d/symbols/qgspointcloud3dsymbol_p.cpp
View File

@ -426,7 +426,7 @@ void QgsColorRampPointCloud3DSymbolHandler::processNode( QgsPointCloudIndex *pc,
{
coordinateTransform.transformInPlace( x, y, z );
}
catch ( QgsCsException &e )
catch ( QgsCsException & )
{
if ( !alreadyPrintedDebug )
{
@ -545,7 +545,7 @@ void QgsRGBPointCloud3DSymbolHandler::processNode( QgsPointCloudIndex *pc, const
{
coordinateTransform.transformInPlace( x, y, z );
}
catch ( QgsCsException &e )
catch ( QgsCsException & )
{
if ( !alreadyPrintedDebug )
{
@ -699,7 +699,7 @@ void QgsClassificationPointCloud3DSymbolHandler::processNode( QgsPointCloudIndex
{
coordinateTransform.transformInPlace( x, y, z );
}
catch ( QgsCsException &e )
catch ( QgsCsException & )
{
if ( !alreadyPrintedDebug )
{

4
src/core/qgsdataitem.cpp
View File

@ -163,7 +163,7 @@ QgsAbstractDatabaseProviderConnection *QgsDataCollectionItem::databaseConnection
return static_cast<QgsAbstractDatabaseProviderConnection *>( md->createConnection( databaseFilePath, {} ) );
}
}
catch ( QgsProviderConnectionException &ex )
catch ( QgsProviderConnectionException & )
{
// This is expected and it is not an error in case the provider does not implement
// the connections API
@ -1911,7 +1911,7 @@ QgsAbstractDatabaseProviderConnection *QgsDatabaseSchemaItem::databaseConnection
{
return static_cast<QgsAbstractDatabaseProviderConnection *>( md->createConnection( connectionName ) );
}
catch ( QgsProviderConnectionException &ex )
catch ( QgsProviderConnectionException & )
{
// This is expected and it is not an error in case the provider does not implement
// the connections API

8
src/core/settings/qgssettingsregistrycore.h
View File

@ -25,6 +25,14 @@
#include "qgis.h"
#include "qgssnappingconfig.h"
#include "qgsgeometry.h"
#include "qgsmaplayerproxymodel.h"
template class CORE_EXPORT QgsSettingsEntryEnumFlag<QgsSnappingConfig::SnappingTypes> SIP_SKIP;
template class CORE_EXPORT QgsSettingsEntryEnumFlag<QgsTolerance::UnitType> SIP_SKIP;
template class CORE_EXPORT QgsSettingsEntryEnumFlag<QgsGeometry::JoinStyle> SIP_SKIP;
template class CORE_EXPORT QgsSettingsEntryEnumFlag<QgsGeometry::EndCapStyle> SIP_SKIP;
template class CORE_EXPORT QgsSettingsEntryEnumFlag<QgsUnitTypes::LayoutUnit> SIP_SKIP;
template class CORE_EXPORT QgsSettingsEntryEnumFlag< class QFlags<enum QgsMapLayerProxyModel::Filter> > SIP_SKIP;
/**
* \ingroup core