Skip to content
Permalink
Browse files

fix docstring "since" for QGIS_SERVER_WMS_MAX_XXXX to 3.6.2

This was backported in #9752
  • Loading branch information
mbernasocchi authored and nyalldawson committed Jan 16, 2020
1 parent ddfa98c commit c65815957d2cafd5563b9b83de348279487dab92
Showing with 6 additions and 6 deletions.
  1. +2 −2 python/server/auto_generated/qgsserversettings.sip.in
  2. +4 −4 src/server/qgsserversettings.h
@@ -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;
@@ -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;

0 comments on commit c658159

Please sign in to comment.
You can’t perform that action at this time.