SIP sync

Author: nyalldawson

python/core/composer/qgscomposerobject.sip

@@ -54,8 +54,14 @@ class QgsComposerObject : QObject, QgsExpressionContextGenerator
       //legend item
       LegendTitle, //!< Legend title
       LegendColumnCount, //!< Legend column count
+      ScalebarFillColor, //!< Scalebar fill color
+      ScalebarFillColor2, //!< Scalebar secondary fill color
+      ScalebarLineColor, //!< Scalebar line color
+      ScalebarLineWidth, //!< Scalebar line width
     };
 
+    static const QgsPropertiesDefinition PROPERTY_DEFINITIONS;
+
     /** Specifies whether the value returned by a function should be the original, user
      * set value, or the current evaluated value for the property. This may differ if
      * a property has a data defined expression active.

python/core/composer/qgscomposerscalebar.sip

@@ -309,6 +309,7 @@ class QgsComposerScaleBar: QgsComposerItem
     void updateSegmentSize();
     /** Sets mCompositionMap to 0 if the map is deleted*/
     void invalidateCurrentMap();
+    virtual void refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties, const QgsExpressionContext* context = nullptr );
 
   protected:
     /** Calculates with of a segment in mm and stores it in mSegmentMillimeters*/

python/core/qgsdiagramrenderer.sip

@@ -209,6 +209,8 @@ class QgsDiagramLayerSettings
 
     void setDataDefinedProperties( const QgsPropertyCollection& collection );
 
+    static const QgsPropertiesDefinition PROPERTY_DEFINITIONS;
+
 };
 
 /** \ingroup core

python/core/qgspallabeling.sip

@@ -460,6 +460,8 @@ class QgsPalLayerSettings
     int mFeatsSendingToPal; // total features tested for sending into PAL (relative to maxNumLabels)
     int mFeatsRegPal; // number of features registered in PAL, when using limitNumLabels
 
+    static const QgsPropertiesDefinition PROPERTY_DEFINITIONS;
+
 };
 
 class QgsLabelCandidate

python/core/symbology-ng/qgs25drenderer.sip

@@ -67,7 +67,7 @@ class Qgs25DRenderer : QgsFeatureRenderer
     /**
      * Get wall shading enabled
      */
-    bool wallShadingEnabled();
+    bool wallShadingEnabled() const;
 
     /**
      * Get the shadow's color

python/core/symbology-ng/qgssymbollayer.sip

@@ -122,6 +122,8 @@ class QgsSymbolLayer
       PropertyArrowType, //!< Arrow type
     };
 
+    static const QgsPropertiesDefinition PROPERTY_DEFINITIONS;
+
     virtual ~QgsSymbolLayer();
 
     /**