Fix tests and reference image

qgis · Apr 14, 2020 · 7c1d1fe · 7c1d1fe
1 parent 0037e56
commit 7c1d1fe
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/python/core/auto_generated/qgspropertycollection.sip.in b/python/core/auto_generated/qgspropertycollection.sip.in
@@ -238,12 +238,9 @@ Returns ``True`` if preparation was successful.
 Returns the set of any fields referenced by the active properties from the collection.
 
 :param context: expression context the properties will be evaluated against.
-
-.. note::
-
-   The optional argument ignoreContext has been added in QGIS 3.14. When set to true,
-   even fields not set in context's fields() will be reported - this is useful e.g. with vector tiles
-   where the actual available field names may not be known beforehand.
+:param ignoreContext: This parameter has been added in QGIS 3.14. When set to true, even fields not set
+                      in context's fields() will be reported - this is useful e.g. with vector tiles
+                      where the actual available field names may not be known beforehand.
 %End
 
     virtual bool isActive( int key ) const = 0;
@@ -550,6 +547,9 @@ Returns the calculated value of the highest priority property with the specified
 Returns the set of any fields referenced by the active properties from the stack.
 
 :param context: expression context the properties will be evaluated against.
+:param ignoreContext: This parameter has been added in QGIS 3.14. When set to true, even fields not set
+                      in context's fields() will be reported - this is useful e.g. with vector tiles
+                      where the actual available field names may not be known beforehand.
 %End
     virtual bool prepare( const QgsExpressionContext &context = QgsExpressionContext() ) const;
 

diff --git a/src/core/qgspropertycollection.h b/src/core/qgspropertycollection.h
@@ -207,9 +207,9 @@ class CORE_EXPORT QgsAbstractPropertyCollection
     /**
      * Returns the set of any fields referenced by the active properties from the collection.
      * \param context expression context the properties will be evaluated against.
-     * \note The optional argument ignoreContext has been added in QGIS 3.14. When set to true,
-     * even fields not set in context's fields() will be reported - this is useful e.g. with vector tiles
-     * where the actual available field names may not be known beforehand.
+     * \param ignoreContext This parameter has been added in QGIS 3.14. When set to true, even fields not set
+     *                      in context's fields() will be reported - this is useful e.g. with vector tiles
+     *                      where the actual available field names may not be known beforehand.
      */
     virtual QSet< QString > referencedFields( const QgsExpressionContext &context = QgsExpressionContext(), bool ignoreContext = false ) const = 0;
 
@@ -478,6 +478,9 @@ class CORE_EXPORT QgsPropertyCollectionStack : public QgsAbstractPropertyCollect
     /**
      * Returns the set of any fields referenced by the active properties from the stack.
      * \param context expression context the properties will be evaluated against.
+     * \param ignoreContext This parameter has been added in QGIS 3.14. When set to true, even fields not set
+     *                      in context's fields() will be reported - this is useful e.g. with vector tiles
+     *                      where the actual available field names may not be known beforehand.
      */
     QSet< QString > referencedFields( const QgsExpressionContext &context = QgsExpressionContext(), bool ignoreContext = false ) const override;
     bool prepare( const QgsExpressionContext &context = QgsExpressionContext() ) const override;

diff --git a/tests/src/core/testqgsvectortilelayer.cpp b/tests/src/core/testqgsvectortilelayer.cpp
@@ -146,7 +146,7 @@ void TestQgsVectorTileLayer::test_labeling()
 
   QgsPalLayerSettings labelSettings;
   labelSettings.drawLabels = true;
-  labelSettings.fieldName = "name";
+  labelSettings.fieldName = "name:en";
   labelSettings.placement = QgsPalLayerSettings::OverPoint;
   labelSettings.setFormat( format );
 

diff --git a/...ges/vector_tile/expected_render_test_labeling/expected_render_test_labeling.png b/...ges/vector_tile/expected_render_test_labeling/expected_render_test_labeling.png