diff --git a/qmlplugin/declarativeareaseries.cpp b/qmlplugin/declarativeareaseries.cpp
index 3330c07..53619b8 100644
--- a/qmlplugin/declarativeareaseries.cpp
+++ b/qmlplugin/declarativeareaseries.cpp
@@ -21,6 +21,7 @@
 #include "declarativeareaseries.h"
 #include "declarativechart.h"
 #include "qchart.h"
+#include "qxymodelmapper.h"
 
 QTCOMMERCIALCHART_BEGIN_NAMESPACE
 
@@ -35,7 +36,10 @@ bool DeclarativeAreaSeries::setDeclarativeUpperModel(DeclarativeXyModel *model)
     bool value(false);
     if (m) {
         upperSeries()->setModel(m);
-        upperSeries()->setModelMapping(0, 1, Qt::Vertical);
+        QXYModelMapper *mapper = new QXYModelMapper;
+        mapper->setMapX(0);
+        mapper->setMapY(1);
+        upperSeries()->setModelMapper(mapper);
     } else {
         qWarning("DeclarativeAreaSeries: Illegal model");
     }
@@ -53,7 +57,10 @@ bool DeclarativeAreaSeries::setDeclarativeLowerModel(DeclarativeXyModel *model)
     bool value(false);
     if (m) {
         lowerSeries()->setModel(m);
-        lowerSeries()->setModelMapping(0, 1, Qt::Vertical);
+        QXYModelMapper *mapper = new QXYModelMapper;
+        mapper->setMapX(0);
+        mapper->setMapY(1);
+        lowerSeries()->setModelMapper(mapper);
     } else {
         qWarning("DeclarativeAreaSeries: Illegal model");
     }
diff --git a/qmlplugin/declarativebarseries.cpp b/qmlplugin/declarativebarseries.cpp
index cf7d6a4..1724c80 100644
--- a/qmlplugin/declarativebarseries.cpp
+++ b/qmlplugin/declarativebarseries.cpp
@@ -59,8 +59,8 @@ void DeclarativeBarSeries::classBegin()
 
 void DeclarativeBarSeries::componentComplete()
 {
-    if (model())
-        setModelMapping(0, 1, 1, Qt::Vertical);
+//    if (model())
+//        setModelMapping(0, 1, 1, Qt::Vertical);
 }
 
 bool DeclarativeBarSeries::setDeclarativeModel(DeclarativeBarModel *model)
@@ -68,9 +68,9 @@ bool DeclarativeBarSeries::setDeclarativeModel(DeclarativeBarModel *model)
     QAbstractItemModel *m = qobject_cast<QAbstractItemModel *>(model);
     bool value(false);
     if (m) {
-        value = setModel(m);
+        setModel(m);
         //setModelMapping(int categories, int bottomBoundary, int topBoundary, Qt::Orientation orientation = Qt::Vertical);
-        setModelMapping(0, 1, 1, Qt::Vertical);
+//        setModelMapping(0, 1, 1, Qt::Vertical);
     } else {
         qWarning("DeclarativeBarSeries: Illegal model");
     }
diff --git a/test/auto/qlineseries/tst_qlineseries.cpp b/test/auto/qlineseries/tst_qlineseries.cpp
index d0ca823..399d778 100644
--- a/test/auto/qlineseries/tst_qlineseries.cpp
+++ b/test/auto/qlineseries/tst_qlineseries.cpp
@@ -492,9 +492,9 @@ void tst_QLineSeries::setModelMapping()
 {
     QSKIP("Model mapping has been rewriten, test case needs update", SkipAll);
 
-    QFETCH(int, modelX);
-    QFETCH(int, modelY);
-    QFETCH(Qt::Orientation, orientation);
+//    QFETCH(int, modelX);
+//    QFETCH(int, modelY);
+//    QFETCH(Qt::Orientation, orientation);
 
 //    QLineSeries series;
 
@@ -538,12 +538,12 @@ void tst_QLineSeries::setModelMappingRange()
 {
     QSKIP("Model mapping has been rewriten, test case needs update", SkipAll);
 
-    QFETCH(int, first);
-    QFETCH(int, count);
-    QLineSeries series;
+//    QFETCH(int, first);
+//    QFETCH(int, count);
+//    QLineSeries series;
 
-    QStandardItemModel *model = new QStandardItemModel(0, 2);
-    series.setModel(model);
+//    QStandardItemModel *model = new QStandardItemModel(0, 2);
+//    series.setModel(model);
 //    series.setModelMapping(0, 1);
 //    series.setModelMappingRange(first, count);