sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-15 00:07:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix docstring "since" for QGIS_SERVER_WMS_MAX_XXXX to 3.6.2

Browse Source 
This was backported in #9752
This commit is contained in:
Marco Bernasocchi 2020-01-16 19:42:35 +01:00 committed by Nyall Dawson
parent ddfa98cfbf
commit c65815957d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/server/auto_generated/qgsserversettings.sip.in
View File

@ -143,7 +143,7 @@ Returns the server-wide max height of a WMS GetMap request. The lower one of thi
:return: the max height of a WMS GetMap request.
.. versionadded:: 3.8
.. versionadded:: 3.6.2
%End
int wmsMaxWidth() const;
@ -152,7 +152,7 @@ Returns the server-wide max width of a WMS GetMap request. The lower one of this
:return: the max width of a WMS GetMap request.
.. versionadded:: 3.8
.. versionadded:: 3.6.2
%End
QString apiResourcesDirectory() const;

8
src/server/qgsserversettings.h
View File

@ -63,8 +63,8 @@ class SERVER_EXPORT QgsServerSettingsEnv : public QObject
QGIS_SERVER_CACHE_SIZE,
QGIS_SERVER_SHOW_GROUP_SEPARATOR, //! Show group (thousands) separator when formatting numeric values, defaults to FALSE (since QGIS 3.8)
QGIS_SERVER_OVERRIDE_SYSTEM_LOCALE, //! Override system locale (since QGIS 3.8)
QGIS_SERVER_WMS_MAX_HEIGHT, //! Maximum height for a WMS request. The most conservative between this and the project one is used (since QGIS 3.8)
QGIS_SERVER_WMS_MAX_WIDTH, //! Maximum width for a WMS request. The most conservative between this and the project one is used (since QGIS 3.8)
QGIS_SERVER_WMS_MAX_HEIGHT, //! Maximum height for a WMS request. The most conservative between this and the project one is used (since QGIS 3.6.2)
QGIS_SERVER_WMS_MAX_WIDTH, //! Maximum width for a WMS request. The most conservative between this and the project one is used (since QGIS 3.6.2)
QGIS_SERVER_API_RESOURCES_DIRECTORY, //! Base directory where HTML templates and static assets (e.g. images, js and css files) are searched for (since QGIS 3.10).
QGIS_SERVER_API_WFS3_MAX_LIMIT //! Maximum value for "limit" in a features request, defaults to 10000 (since QGIS 3.10).
};
@ -191,14 +191,14 @@ class SERVER_EXPORT QgsServerSettings
/**
* Returns the server-wide max height of a WMS GetMap request. The lower one of this and the project configuration is used.
* \returns the max height of a WMS GetMap request.
* \since QGIS 3.8
* \since QGIS 3.6.2
*/
int wmsMaxHeight() const;
/**
* Returns the server-wide max width of a WMS GetMap request. The lower one of this and the project configuration is used.
* \returns the max width of a WMS GetMap request.
* \since QGIS 3.8
* \since QGIS 3.6.2
*/
int wmsMaxWidth() const;