Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1

Conflicts:
	.qmake.conf
	README
	src/charts/qchartglobal.h

Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a

12 files changed, 12 insertions, 11 deletions

diff --git a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h
index 3a7316a6..104093df 100644
--- a/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h
+++ b/src/charts/barchart/horizontal/bar/qhorizontalbarseries.h
@@ -40,7 +40,7 @@ class QT_CHARTS_EXPORT QHorizontalBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
-    explicit QHorizontalBarSeries(QObject *parent = 0);
+    explicit QHorizontalBarSeries(QObject *parent = Q_NULLPTR);
     ~QHorizontalBarSeries();
     QAbstractSeries::SeriesType type() const;
 
diff --git a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h
index 0b37d7b1..6c2928b9 100644
--- a/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h
+++ b/src/charts/barchart/horizontal/percent/qhorizontalpercentbarseries.h
@@ -40,7 +40,7 @@ class QT_CHARTS_EXPORT QHorizontalPercentBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
-    explicit QHorizontalPercentBarSeries(QObject *parent = 0);
+    explicit QHorizontalPercentBarSeries(QObject *parent = Q_NULLPTR);
     ~QHorizontalPercentBarSeries();
     QAbstractSeries::SeriesType type() const;
 
diff --git a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h
index eb32a770..3c2711d1 100644
--- a/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h
+++ b/src/charts/barchart/horizontal/stacked/qhorizontalstackedbarseries.h
@@ -40,7 +40,7 @@ class QT_CHARTS_EXPORT QHorizontalStackedBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
-    explicit QHorizontalStackedBarSeries(QObject *parent = 0);
+    explicit QHorizontalStackedBarSeries(QObject *parent = Q_NULLPTR);
     ~QHorizontalStackedBarSeries();
     QAbstractSeries::SeriesType type() const;
 
diff --git a/src/charts/barchart/qabstractbarseries.h b/src/charts/barchart/qabstractbarseries.h
index 25226590..3bff84a4 100644
--- a/src/charts/barchart/qabstractbarseries.h
+++ b/src/charts/barchart/qabstractbarseries.h
@@ -86,7 +86,7 @@ public:
     QAbstractBarSeries::LabelsPosition labelsPosition() const;
 
 protected:
-    explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = 0);
+    explicit QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent = Q_NULLPTR);
 
 Q_SIGNALS:
     void clicked(int index, QBarSet *barset);
diff --git a/src/charts/barchart/qbarmodelmapper.cpp b/src/charts/barchart/qbarmodelmapper.cpp
index b1f29a7c..500429f8 100644
--- a/src/charts/barchart/qbarmodelmapper.cpp
+++ b/src/charts/barchart/qbarmodelmapper.cpp
@@ -60,6 +60,7 @@ void QBarModelMapper::setModel(QAbstractItemModel *model)
     d->m_model = model;
     d->initializeBarFromModel();
     // connect signals from the model
+    connect(d->m_model, SIGNAL(modelReset()), d, SLOT(initializeBarFromModel()));
     connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
     connect(d->m_model, SIGNAL(headerDataChanged(Qt::Orientation,int,int)), d, SLOT(modelHeaderDataUpdated(Qt::Orientation,int,int)));
     connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelRowsAdded(QModelIndex,int,int)));
diff --git a/src/charts/barchart/qbarmodelmapper.h b/src/charts/barchart/qbarmodelmapper.h
index 57d4c9fc..1118fd22 100644
--- a/src/charts/barchart/qbarmodelmapper.h
+++ b/src/charts/barchart/qbarmodelmapper.h
@@ -47,7 +47,7 @@ class QT_CHARTS_EXPORT QBarModelMapper : public QObject
     Q_OBJECT
 
 protected:
-    explicit QBarModelMapper(QObject *parent = 0);
+    explicit QBarModelMapper(QObject *parent = Q_NULLPTR);
 
     QAbstractItemModel *model() const;
     void setModel(QAbstractItemModel *model);
diff --git a/src/charts/barchart/qbarset.h b/src/charts/barchart/qbarset.h
index b312f479..0859bff5 100644
--- a/src/charts/barchart/qbarset.h
+++ b/src/charts/barchart/qbarset.h
@@ -51,7 +51,7 @@ class QT_CHARTS_EXPORT QBarSet : public QObject
     Q_PROPERTY(QColor labelColor READ labelColor WRITE setLabelColor NOTIFY labelColorChanged)
 
 public:
-    explicit QBarSet(const QString label, QObject *parent = 0);
+    explicit QBarSet(const QString label, QObject *parent = Q_NULLPTR);
     virtual ~QBarSet();
 
     void setLabel(const QString label);
diff --git a/src/charts/barchart/qhbarmodelmapper.h b/src/charts/barchart/qhbarmodelmapper.h
index 36947b28..8063a811 100644
--- a/src/charts/barchart/qhbarmodelmapper.h
+++ b/src/charts/barchart/qhbarmodelmapper.h
@@ -45,7 +45,7 @@ class QT_CHARTS_EXPORT QHBarModelMapper : public QBarModelMapper
     Q_PROPERTY(int columnCount READ columnCount WRITE setColumnCount NOTIFY columnCountChanged)
 
 public:
-    explicit QHBarModelMapper(QObject *parent = 0);
+    explicit QHBarModelMapper(QObject *parent = Q_NULLPTR);
 
     QAbstractItemModel *model() const;
     void setModel(QAbstractItemModel *model);
diff --git a/src/charts/barchart/qvbarmodelmapper.h b/src/charts/barchart/qvbarmodelmapper.h
index 7f432e43..a4e8ae39 100644
--- a/src/charts/barchart/qvbarmodelmapper.h
+++ b/src/charts/barchart/qvbarmodelmapper.h
@@ -45,7 +45,7 @@ class QT_CHARTS_EXPORT QVBarModelMapper : public QBarModelMapper
     Q_PROPERTY(int rowCount READ rowCount WRITE setRowCount NOTIFY rowCountChanged)
 
 public:
-    explicit QVBarModelMapper(QObject *parent = 0);
+    explicit QVBarModelMapper(QObject *parent = Q_NULLPTR);
 
     QAbstractItemModel *model() const;
     void setModel(QAbstractItemModel *model);
diff --git a/src/charts/barchart/vertical/bar/qbarseries.h b/src/charts/barchart/vertical/bar/qbarseries.h
index 0004a2c4..95d9ae24 100644
--- a/src/charts/barchart/vertical/bar/qbarseries.h
+++ b/src/charts/barchart/vertical/bar/qbarseries.h
@@ -40,7 +40,7 @@ class QT_CHARTS_EXPORT QBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
-    explicit QBarSeries(QObject *parent = 0);
+    explicit QBarSeries(QObject *parent = Q_NULLPTR);
     ~QBarSeries();
     QAbstractSeries::SeriesType type() const;
 
diff --git a/src/charts/barchart/vertical/percent/qpercentbarseries.h b/src/charts/barchart/vertical/percent/qpercentbarseries.h
index bc2b7b65..ee4796c4 100644
--- a/src/charts/barchart/vertical/percent/qpercentbarseries.h
+++ b/src/charts/barchart/vertical/percent/qpercentbarseries.h
@@ -41,7 +41,7 @@ class QT_CHARTS_EXPORT QPercentBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
-    explicit QPercentBarSeries(QObject *parent = 0);
+    explicit QPercentBarSeries(QObject *parent = Q_NULLPTR);
     ~QPercentBarSeries();
     QAbstractSeries::SeriesType type() const;
 
diff --git a/src/charts/barchart/vertical/stacked/qstackedbarseries.h b/src/charts/barchart/vertical/stacked/qstackedbarseries.h
index 88392d9f..d3efa99a 100644
--- a/src/charts/barchart/vertical/stacked/qstackedbarseries.h
+++ b/src/charts/barchart/vertical/stacked/qstackedbarseries.h
@@ -41,7 +41,7 @@ class QT_CHARTS_EXPORT QStackedBarSeries : public QAbstractBarSeries
 {
     Q_OBJECT
 public:
-    explicit QStackedBarSeries(QObject *parent = 0);
+    explicit QStackedBarSeries(QObject *parent = Q_NULLPTR);
     ~QStackedBarSeries();
     QAbstractSeries::SeriesType type() const;