diff --git a/images/themes/default/mIconDataDefineExpression.svg b/images/themes/default/mIconDataDefineExpression.svg
diff --git a/images/themes/default/mIconDataDefineExpressionError.svg b/images/themes/default/mIconDataDefineExpressionError.svg
diff --git a/images/themes/default/mIconDataDefineExpressionOn.svg b/images/themes/default/mIconDataDefineExpressionOn.svg
diff --git a/images/themes/default/mIconDataDefineOn.svg b/images/themes/default/mIconDataDefineOn.svg
diff --git a/images/themes/default/mIconExpression.svg b/images/themes/default/mIconExpression.svg
diff --git a/images/themes/default/mIconExpressionEditorOpen.svg b/images/themes/default/mIconExpressionEditorOpen.svg
diff --git a/images/themes/default/mIconLabelQuadrantCenter.svg b/images/themes/default/mIconLabelQuadrantCenter.svg
diff --git a/images/themes/default/mIconLabelQuadrantOffset.svg b/images/themes/default/mIconLabelQuadrantOffset.svg
diff --git a/images/themes/default/propertyicons/datadefined.svg b/images/themes/default/propertyicons/datadefined.svg
diff --git a/images/themes/default/propertyicons/labelbackground.svg b/images/themes/default/propertyicons/labelbackground.svg
diff --git a/images/themes/default/propertyicons/labelbuffer.svg b/images/themes/default/propertyicons/labelbuffer.svg
diff --git a/images/themes/default/propertyicons/labelformatting.svg b/images/themes/default/propertyicons/labelformatting.svg
diff --git a/images/themes/default/propertyicons/labelshadow.svg b/images/themes/default/propertyicons/labelshadow.svg
diff --git a/images/themes/default/propertyicons/labeltext.svg b/images/themes/default/propertyicons/labeltext.svg
diff --git a/images/themes/default/propertyicons/render.svg b/images/themes/default/propertyicons/render.svg
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -19,6 +19,7 @@
 %Include qgscoordinatetransform.sip
 %Include qgscredentials.sip
 %Include qgscrscache.sip
+%Include qgsdatadefined.sip
 %Include qgsdataitem.sip
 %Include qgsdataprovider.sip
 %Include qgsdatasourceuri.sip

diff --git a/python/core/qgsdatadefined.sip b/python/core/qgsdatadefined.sip
@@ -0,0 +1,53 @@
+/** \ingroup core
+ * \class QgsDataDefined
+ * A container class for data source field mapping or expression.
+ * @note added in QGIS 1.9
+ */
+
+class QgsDataDefined
+{
+%TypeHeaderCode
+#include <qgsdatadefined.h>
+%End
+  public:
+    /**
+     * Construct a new data defined object
+     *
+     * @param parent The parent QWidget
+     * @param active Whether the current data defined is active
+     * @param useexpr Whether to use expression instead of field
+     * @param expr Expression string
+     * @param field Field name string
+     */
+    QgsDataDefined( bool active = false,
+                    bool useexpr = false,
+                    const QString& expr = QString(),
+                    const QString& field = QString() );
+
+    ~QgsDataDefined();
+
+    bool isActive() const;
+    void setActive( bool active );
+
+    bool useExpression() const;
+    void setUseExpression( bool use );
+
+    QString expressionString() const;
+    void setExpressionString( const QString& expr );
+
+    //QMap<QString, QVariant> expressionParams() const;
+    //void setExpressionParams( QMap<QString, QVariant> params );
+    void insertExpressionParam( QString key, QVariant param );
+
+    bool prepareExpression( QgsVectorLayer* layer );
+    bool expressionIsPrepared() const;
+
+    QgsExpression* expression();
+    QStringList referencedColumns( QgsVectorLayer* layer );
+
+    QString field() const;
+    void setField( const QString& field );
+
+    //QMap< QString, QString > toMap();
+
+};
diff --git a/python/core/qgsmaprenderer.sip b/python/core/qgsmaprenderer.sip
@@ -6,7 +6,7 @@ class QgsLabelPosition
 #include <qgsmaprenderer.h>
 %End
   public:
-    QgsLabelPosition( int id, double r, const QVector< QgsPoint >& corners, const QgsRectangle& rect, double w, double h, const QString& layer, const QString& labeltext, bool upside_down, bool diagram = false, bool pinned = false );
+    QgsLabelPosition( int id, double r, const QVector< QgsPoint >& corners, const QgsRectangle& rect, double w, double h, const QString& layer, const QString& labeltext, const QFont& labelfont, bool upside_down, bool diagram = false, bool pinned = false );
     QgsLabelPosition();
     int featureId;
     double rotation;
@@ -16,6 +16,7 @@ class QgsLabelPosition
     double height;
     QString layerID;
     QString labelText;
+    QFont labelFont;
     bool upsideDown;
     bool isDiagram;
     bool isPinned;
@@ -38,6 +39,12 @@ class QgsLabelingEngineInterface
     virtual void init( QgsMapRenderer* mp ) = 0;
     //! called to find out whether the layer is used for labeling
     virtual bool willUseLayer( QgsVectorLayer* layer ) = 0;
+    //! clears all PAL layer settings for registered layers
+    //! @note: this method was added in version 1.9
+    virtual void clearActiveLayers() = 0;
+    //! clears data defined objects from PAL layer settings for a registered layer
+    //! @note: this method was added in version 1.9
+    virtual void clearActiveLayer( QgsVectorLayer* layer ) = 0;
     //! called when starting rendering of a layer
     //! @note: this method was added in version 1.6
     virtual int prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices, QgsRenderContext& ctx ) = 0;