Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	.qmake.conf

Change-Id: I8727ef26fff1c303df0653cd85a019b96de1b501

4 files changed, 14 insertions, 4 deletions

diff --git a/src/charts/axis/verticalaxis.cpp b/src/charts/axis/verticalaxis.cpp
index d59d92b9..de33a388 100644
--- a/src/charts/axis/verticalaxis.cpp
+++ b/src/charts/axis/verticalaxis.cpp
@@ -105,7 +105,7 @@ void VerticalAxis::updateGeometry()
     //title
     QRectF titleBoundingRect;
     QString titleText = axis()->titleText();
-    qreal availableSpace = axisRect.width() - labelPadding();
+    qreal availableSpace = axisRect.height() - labelPadding();
     if (!titleText.isEmpty() && titleItem()->isVisible()) {
         availableSpace -= titlePadding() * 2.0;
         qreal minimumLabelWidth = ChartPresenter::textBoundingRect(axis()->labelsFont(),
diff --git a/src/charts/doc/qtcharts.qdocconf b/src/charts/doc/qtcharts.qdocconf
index 33f569fb..31d53d4f 100644
--- a/src/charts/doc/qtcharts.qdocconf
+++ b/src/charts/doc/qtcharts.qdocconf
@@ -58,3 +58,5 @@ qhp.QtCharts.subprojects.examples.sortPages  = true
 navigation.landingpage = Qt Charts
 navigation.cppclassespage = Qt Charts C++ Classes
 navigation.qmltypespage = Qt Charts QML Types
+
+manifestmeta.highlighted.names += "QtCharts/Chart Themes Example"
diff --git a/src/charts/xychart/qxymodelmapper.cpp b/src/charts/xychart/qxymodelmapper.cpp
index 51f4a85a..b8930621 100644
--- a/src/charts/xychart/qxymodelmapper.cpp
+++ b/src/charts/xychart/qxymodelmapper.cpp
@@ -75,6 +75,7 @@ void QXYModelMapper::setModel(QAbstractItemModel *model)
     connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelColumnsAdded(QModelIndex,int,int)));
     connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
     connect(d->m_model, SIGNAL(modelReset()), d, SLOT(initializeXYFromModel()));
+    connect(d->m_model, SIGNAL(layoutChanged()), d, SLOT(initializeXYFromModel()));
     connect(d->m_model, SIGNAL(destroyed()), d, SLOT(handleModelDestroyed()));
 }
 
@@ -379,6 +380,7 @@ void QXYModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottom
                         oldPoint = m_series->points().at(index.row() - m_first);
                         newPoint.setX(valueFromModel(xIndex));
                         newPoint.setY(valueFromModel(yIndex));
+                        m_series->replace(index.row() - m_first, newPoint);
                     }
                 }
             } else if (m_orientation == Qt::Horizontal && (index.row() == m_xSection || index.row() == m_ySection)) {
@@ -389,12 +391,10 @@ void QXYModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottom
                         oldPoint = m_series->points().at(index.column() - m_first);
                         newPoint.setX(valueFromModel(xIndex));
                         newPoint.setY(valueFromModel(yIndex));
+                        m_series->replace(index.column() - m_first, newPoint);
                     }
                 }
-            } else {
-                continue;
             }
-            m_series->replace(oldPoint, newPoint);
         }
     }
     blockSeriesSignals(false);
diff --git a/src/chartsqml2/chartsqml2_plugin.cpp b/src/chartsqml2/chartsqml2_plugin.cpp
index 028248f3..cc95948b 100644
--- a/src/chartsqml2/chartsqml2_plugin.cpp
+++ b/src/chartsqml2/chartsqml2_plugin.cpp
@@ -139,6 +139,13 @@ QML_DECLARE_TYPE(QScatterSeries)
 QML_DECLARE_TYPE(QSplineSeries)
 QML_DECLARE_TYPE(QStackedBarSeries)
 
+static void initResources()
+{
+#ifdef QT_STATIC
+    Q_INIT_RESOURCE(qmake_QtCharts);
+#endif
+}
+
 QT_CHARTS_BEGIN_NAMESPACE
 
 class QtChartsQml2Plugin : public QQmlExtensionPlugin
@@ -148,6 +155,7 @@ class QtChartsQml2Plugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
+    QtChartsQml2Plugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
     virtual void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtCharts"));