fix tests

This commit is contained in:
Denis Rouzaud 2022-04-25 13:50:48 +02:00 committed by Nyall Dawson
parent 75a0c882bb
commit d5cfb7e0f6
5 changed files with 12 additions and 19 deletions

View File

@ -1,10 +1,10 @@
# The following has been generated automatically from src/core/qgsowsconnection.h
# monkey patching scoped based enum
QgsOwsConnection.DpiMode.All.__doc__ = ""
QgsOwsConnection.DpiMode.Off.__doc__ = ""
QgsOwsConnection.DpiMode.QGIS.__doc__ = ""
QgsOwsConnection.DpiMode.UMN.__doc__ = ""
QgsOwsConnection.DpiMode.GeoServer.__doc__ = ""
QgsOwsConnection.DpiMode.All.__doc__ = "All"
QgsOwsConnection.DpiMode.Off.__doc__ = "Off"
QgsOwsConnection.DpiMode.QGIS.__doc__ = "QGIS"
QgsOwsConnection.DpiMode.UMN.__doc__ = "UMN"
QgsOwsConnection.DpiMode.GeoServer.__doc__ = "GeoServer"
QgsOwsConnection.DpiMode.__doc__ = 'DpiMode enum\n\n.. versionadded:: 3.26\n\n' + '* ``All``: ' + QgsOwsConnection.DpiMode.All.__doc__ + '\n' + '* ``Off``: ' + QgsOwsConnection.DpiMode.Off.__doc__ + '\n' + '* ``QGIS``: ' + QgsOwsConnection.DpiMode.QGIS.__doc__ + '\n' + '* ``UMN``: ' + QgsOwsConnection.DpiMode.UMN.__doc__ + '\n' + '* ``GeoServer``: ' + QgsOwsConnection.DpiMode.GeoServer.__doc__
# --
QgsOwsConnection.DpiMode.baseClass = QgsOwsConnection

View File

@ -82,11 +82,6 @@ QgsDataSourceUri &QgsGeoNodeConnection::addWcsConnectionSettings( QgsDataSourceU
return QgsOwsConnection::addWmsWcsConnectionSettings( uri, QgsGeoNodeConnectionUtils::sGeoNodeConnection, detailedConnectionName );
}
QString QgsGeoNodeConnection::settingsKey() const
{
return QgsGeoNodeConnectionUtils::sGeoNodeConnection + QStringLiteral( "/" ) + mConnName;
}
//
// QgsGeoNodeConnectionUtils
//

View File

@ -122,8 +122,6 @@ class CORE_EXPORT QgsGeoNodeConnection
//! Property of mUri
QgsDataSourceUri mUri;
QString settingsKey() const;
};

View File

@ -40,17 +40,17 @@ class CORE_EXPORT QgsOwsConnection : public QObject
public:
/*
/**
* DpiMode enum
* \since QGIS 3.26
*/
enum class DpiMode
{
All = 7,
Off = 0,
QGIS = 1,
UMN = 2,
GeoServer = 4,
All = 7, //!< All
Off = 0, //!< Off
QGIS = 1, //!< QGIS
UMN = 2, //!< UMN
GeoServer = 4, //!< GeoServer
};
Q_ENUM( DpiMode )

View File

@ -75,7 +75,7 @@ for MODULE in "${MODULES[@]}"; do
RETURN_CODE=1
fi
else
COUNT=$((${COUNT}+${!GROUP_COUNT_VAR_NAME}))
COUNT=$((COUNT+${!GROUP_COUNT_VAR_NAME}))
fi
done 3< <(git grep --only-matching -E 'addSettingsEntryGroup\( *(\&\w+::)?(\w+) *\)' ${REG_FILE})
COUNT_VAR="COUNT_${MODULE}"