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

Conflicts:
	.qmake.conf

Change-Id: I8727ef26fff1c303df0653cd85a019b96de1b501

8 files changed, 71 insertions, 13 deletions

diff --git a/dist/changes-5.9.0 b/dist/changes-5.9.0
new file mode 100644
index 00000000..3e86e82d
--- /dev/null
+++ b/dist/changes-5.9.0
@@ -0,0 +1,34 @@
+Qt 5.9 introduces many new features and improvements as well as bugfixes
+over the 5.8.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+http://doc.qt.io/qt-5/index.html
+
+The Qt version 5.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+New features
+------------
+- [QTBUG-50682] Added a possibility to change legend marker shape
+- [QTBUG-52379] Added support for more than one bar series
+- [QTBUG-51612] Added minor ticks support for QLogValueAxis
+
+Fixed issues
+------------
+- [QTBUG-52442] Optimized barcharts painting
+- [QTBUG-56238] Removed 200x200 minimum size from chart
+- [QTBUG-57328] Fixed crash when log axis range is initialized to contain no ticks
+- [QTBUG-57351] Fixed domain ranges when attaching new axis that changes domain type
+- [QTBUG-59835] Fixed some series blocking mouse events from series items
+- Fixed reversing logarithmic y axis
+- Fixed crash when animating axes with polar charts
+- Fixed some issues with syncing item and series visibility
+
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"));
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 81557a7f..321ca26c 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -37,6 +37,9 @@ SUBDIRS += \
 qtHaveModule(quick) {
     SUBDIRS += qml \
                qml-qtquicktest
+
+    # QTBUG-20268
+    boot2qt: SUBDIRS -= qml-qtquicktest
 }
 
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
diff --git a/tests/auto/qareaseries/tst_qareaseries.cpp b/tests/auto/qareaseries/tst_qareaseries.cpp
index 16fa94b3..47494328 100644
--- a/tests/auto/qareaseries/tst_qareaseries.cpp
+++ b/tests/auto/qareaseries/tst_qareaseries.cpp
@@ -1,23 +1,31 @@
-/******************************************************************************
+/****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2017 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
-** This file is part of the Qt Charts module.
-**
-** $QT_BEGIN_LICENSE:COMM$
+** This file is part of the Qt Charts module of the Qt Toolkit.
 **
+** $QT_BEGIN_LICENSE:GPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
-******************************************************************************/
+****************************************************************************/
 
 #include <QtTest/QtTest>
 #include <QtGui/QImage>
diff --git a/tests/auto/qchart/BLACKLIST b/tests/auto/qchart/BLACKLIST
new file mode 100644
index 00000000..a73cce28
--- /dev/null
+++ b/tests/auto/qchart/BLACKLIST
@@ -0,0 +1,3 @@
+[zoomOut]
+# QTBUG-20268
+b2qt