Rename minimumMargins to margins in QML plugin version 1.2

3 files changed, 19 insertions, 11 deletions

diff --git a/plugins/declarative/declarativechart.cpp b/plugins/declarative/declarativechart.cpp
index 66cb9c3d..51c4f500 100644
--- a/plugins/declarative/declarativechart.cpp
+++ b/plugins/declarative/declarativechart.cpp
@@ -248,15 +248,15 @@ DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
       m_chart(new QChart(this))
 {
     setFlag(QGraphicsItem::ItemHasNoContents, false);
-    m_minMargins = new DeclarativeMargins(this);
-    m_minMargins->setTop(m_chart->margins().top());
-    m_minMargins->setLeft(m_chart->margins().left());
-    m_minMargins->setRight(m_chart->margins().right());
-    m_minMargins->setBottom(m_chart->margins().bottom());
-    connect(m_minMargins, SIGNAL(topChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
-    connect(m_minMargins, SIGNAL(bottomChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
-    connect(m_minMargins, SIGNAL(leftChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
-    connect(m_minMargins, SIGNAL(rightChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
+    m_margins = new DeclarativeMargins(this);
+    m_margins->setTop(m_chart->margins().top());
+    m_margins->setLeft(m_chart->margins().left());
+    m_margins->setRight(m_chart->margins().right());
+    m_margins->setBottom(m_chart->margins().bottom());
+    connect(m_margins, SIGNAL(topChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
+    connect(m_margins, SIGNAL(bottomChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
+    connect(m_margins, SIGNAL(leftChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
+    connect(m_margins, SIGNAL(rightChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
     connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)), this, SLOT(handleSeriesAdded(QAbstractSeries *, Domain *)));
     connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)), this, SIGNAL(seriesRemoved(QAbstractSeries *)));
 }
diff --git a/plugins/declarative/declarativechart.h b/plugins/declarative/declarativechart.h
index 6587ef4b..d08d77c9 100644
--- a/plugins/declarative/declarativechart.h
+++ b/plugins/declarative/declarativechart.h
@@ -51,6 +51,7 @@ class DeclarativeChart : public QDeclarativeItem
     Q_PROPERTY(qreal leftMargin READ leftMargin)
     Q_PROPERTY(qreal rightMargin READ rightMargin)
     Q_PROPERTY(DeclarativeMargins *minimumMargins READ minimumMargins NOTIFY minimumMarginsChanged REVISION 1)
+    Q_PROPERTY(DeclarativeMargins *margins READ margins NOTIFY marginsChanged REVISION 2)
     Q_PROPERTY(QRectF plotArea READ plotArea NOTIFY plotAreaChanged REVISION 1)
     Q_ENUMS(Animation)
     Q_ENUMS(Theme)
@@ -120,7 +121,10 @@ public:
     qreal leftMargin();
     qreal rightMargin();
     void createDefaultAxes(QAbstractSeries* series);
-    DeclarativeMargins *minimumMargins() { return m_minMargins; }
+    //TODO this is depreciated:
+    DeclarativeMargins *minimumMargins() { return m_margins; }
+
+    Q_REVISION(2) DeclarativeMargins *margins() { return m_margins; }
     QRectF plotArea() { return m_chart->plotArea(); }
 
 public:
@@ -147,6 +151,7 @@ Q_SIGNALS:
     void backgroundColorChanged();
     void dropShadowEnabledChanged(bool enabled);
     void minimumMarginsChanged();
+    Q_REVISION(2) void marginsChanged();
     void plotAreaChanged(QRectF plotArea);
     void seriesAdded(QAbstractSeries* series);
     void seriesRemoved(QAbstractSeries* series);
@@ -162,7 +167,7 @@ private:
     // multi inheritance, so we now have a QChart as a member instead
     QChart *m_chart;
     //QMargins m_chartMargins;
-    DeclarativeMargins *m_minMargins;
+    DeclarativeMargins *m_margins;
 };
 
 QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/plugins/declarative/plugin.cpp b/plugins/declarative/plugin.cpp
index 5867439a..006cebd4 100644
--- a/plugins/declarative/plugin.cpp
+++ b/plugins/declarative/plugin.cpp
@@ -164,6 +164,9 @@ class ChartQmlPlugin : public QDeclarativeExtensionPlugin
                                                QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
         qmlRegisterUncreatableType<DeclarativeMargins>(uri, 1, 1, "Margins",
                                                        QLatin1String("Trying to create uncreatable: Margins."));
+
+        // QtCommercial.Chart 1.2
+        qmlRegisterType<DeclarativeChart, 2>(uri, 1, 2, "ChartView");
     }
 };