update docu since 3.8

(cherry-picked from 6b09be7) and resolved conflicts
qgis · Feb 26, 2019 · 47345ba · DelazJ · Feb 27, 2019 · 47345ba
1 parent 1366b66
commit 47345ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/python/core/auto_generated/qgslegendsettings.sip.in b/python/core/auto_generated/qgslegendsettings.sip.in
@@ -199,13 +199,17 @@ The ``scale`` value indicates the scale denominator, e.g. 1000.0 for a 1:1000 ma
 Returns the factor of map units per pixel for symbols with size given in map units calculated by mDpi and mMmPerMapUnit
 
 .. seealso:: :py:func:`setMapUnitsPerPixel`
+
+.. versionadded:: 3.8
 %End
 
     void setMapUnitsPerPixel( double mapUnitsPerPixel );
 %Docstring
 Sets the the mMmPerMapUnit calculated by ``mapUnitsPerPixel`` mostly taken from the map settings.
 
 .. seealso:: :py:func:`mapUnitsPerPixel`
+
+.. versionadded:: 3.8
 %End
 
     int dpi() const;

diff --git a/src/core/qgslegendsettings.h b/src/core/qgslegendsettings.h
@@ -180,12 +180,14 @@ class CORE_EXPORT QgsLegendSettings
     /**
      * Returns the factor of map units per pixel for symbols with size given in map units calculated by mDpi and mMmPerMapUnit
      * \see setMapUnitsPerPixel()
+     * \since QGIS 3.8
      */
     double mapUnitsPerPixel() const;
 
     /**
      * Sets the the mMmPerMapUnit calculated by \a mapUnitsPerPixel mostly taken from the map settings.
      * \see mapUnitsPerPixel()
+     * \since QGIS 3.8
      */
     void setMapUnitsPerPixel( double mapUnitsPerPixel );