diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:30:32 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:30:32 +0200 |
commit | 97bb01ce5d85ac94ed019f0abd7a08917ae4f80a (patch) | |
tree | 2974b3181e1020c0b26e2e75375e6af73afad781 /src/charts/barchart/horizontal | |
parent | bbf52870f4e335c0d169907d4398a12cb41ca3a1 (diff) | |
parent | 35b800491709bafb58c3c8e29f953954f2a7897a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Conflicts:
.qmake.conf
README
src/charts/qchartglobal.h
Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a
Diffstat (limited to 'src/charts/barchart/horizontal')
3 files changed, 3 insertions, 3 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; |