From d0ca4f31f88bedb42de18d546e60d443d7edb74b Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Fri, 1 May 2020 15:48:01 +1000
Subject: [PATCH] Since

---
 python/core/auto_generated/labeling/qgspallabeling.sip.in | 4 ++++
 src/core/labeling/qgslabelfeature.h                       | 2 ++
 src/core/labeling/qgspallabeling.h                        | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/python/core/auto_generated/labeling/qgspallabeling.sip.in b/python/core/auto_generated/labeling/qgspallabeling.sip.in
index f8326ef8c27..f6d8aed6805 100644
--- a/python/core/auto_generated/labeling/qgspallabeling.sip.in
+++ b/python/core/auto_generated/labeling/qgspallabeling.sip.in
@@ -408,6 +408,8 @@ Returns the QgsExpression for this label settings. May be ``None`` if isExpressi
 Returns the polygon placement flags, which dictate how polygon labels can be placed.
 
 .. seealso:: :py:func:`setPolygonPlacementFlags`
+
+.. versionadded:: 3.14
 %End
 
     void setPolygonPlacementFlags( QgsLabeling::PolygonPlacementFlags flags );
@@ -415,6 +417,8 @@ Returns the polygon placement flags, which dictate how polygon labels can be pla
 Sets the polygon placement ``flags``, which dictate how polygon labels can be placed.
 
 .. seealso:: :py:func:`polygonPlacementFlags`
+
+.. versionadded:: 3.14
 %End
 
     bool centroidWhole;
diff --git a/src/core/labeling/qgslabelfeature.h b/src/core/labeling/qgslabelfeature.h
index b063088bc11..0b0f9dfceab 100644
--- a/src/core/labeling/qgslabelfeature.h
+++ b/src/core/labeling/qgslabelfeature.h
@@ -322,6 +322,7 @@ class CORE_EXPORT QgsLabelFeature
      * Returns the polygon placement flags, which dictate how polygon labels can be placed.
      *
      * \see setPolygonPlacementFlags()
+     * \since QGIS 3.14
      */
     QgsLabeling::PolygonPlacementFlags polygonPlacementFlags() const { return mPolygonPlacementFlags; }
 
@@ -329,6 +330,7 @@ class CORE_EXPORT QgsLabelFeature
      * Sets the polygon placement \a flags, which dictate how polygon labels can be placed.
      *
      * \see polygonPlacementFlags()
+     * \since QGIS 3.14
      */
     void setPolygonPlacementFlags( QgsLabeling::PolygonPlacementFlags flags ) { mPolygonPlacementFlags = flags; }
 
diff --git a/src/core/labeling/qgspallabeling.h b/src/core/labeling/qgspallabeling.h
index e2807887e0a..0ebed2d35ca 100644
--- a/src/core/labeling/qgspallabeling.h
+++ b/src/core/labeling/qgspallabeling.h
@@ -443,7 +443,7 @@ class CORE_EXPORT QgsPalLayerSettings
       LinePlacementOptions = 99, //!< Line placement flags
       OverrunDistance = 102, //!< Distance which labels can extend past either end of linear features
       LabelAllParts = 103, //!< Whether all parts of multi-part features should be labeled
-      PolygonLabelOutside = 109, //!< Whether labels outside a polygon feature are permitted, or should be forced
+      PolygonLabelOutside = 109, //!< Whether labels outside a polygon feature are permitted, or should be forced (since QGIS 3.14)
 
       // rendering
       ScaleVisibility = 23,
@@ -652,6 +652,7 @@ class CORE_EXPORT QgsPalLayerSettings
      * Returns the polygon placement flags, which dictate how polygon labels can be placed.
      *
      * \see setPolygonPlacementFlags()
+     * \since QGIS 3.14
      */
     QgsLabeling::PolygonPlacementFlags polygonPlacementFlags() const { return mPolygonPlacementFlags; }
 
@@ -659,6 +660,7 @@ class CORE_EXPORT QgsPalLayerSettings
      * Sets the polygon placement \a flags, which dictate how polygon labels can be placed.
      *
      * \see polygonPlacementFlags()
+     * \since QGIS 3.14
      */
     void setPolygonPlacementFlags( QgsLabeling::PolygonPlacementFlags flags ) { mPolygonPlacementFlags = flags; }