diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:33:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:33:17 +0200 |
| commit | 8427634773505f73ce030cf68761c4719eb03e5c (patch) | |
| tree | 56d0e488e533778782b55c54aa3ab07f0d5e888d /src/datavisualization/data/qbardataproxy.h | |
| parent | 3fb7ce6a29ca69237c777cc65a3831768e938782 (diff) | |
| parent | 364ed207af1becd2b85d93bc87d5db84624b4381 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Conflicts:
src/datavisualization/utils/qutils.h
Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
Diffstat (limited to 'src/datavisualization/data/qbardataproxy.h')
| -rw-r--r-- | src/datavisualization/data/qbardataproxy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/data/qbardataproxy.h b/src/datavisualization/data/qbardataproxy.h index 9db41ed9..d0d58f6e 100644 --- a/src/datavisualization/data/qbardataproxy.h +++ b/src/datavisualization/data/qbardataproxy.h @@ -55,7 +55,7 @@ class QT_DATAVISUALIZATION_EXPORT QBarDataProxy : public QAbstractDataProxy Q_PROPERTY(QStringList columnLabels READ columnLabels WRITE setColumnLabels NOTIFY columnLabelsChanged) Q_PROPERTY(QBar3DSeries *series READ series NOTIFY seriesChanged) public: - explicit QBarDataProxy(QObject *parent = 0); + explicit QBarDataProxy(QObject *parent = Q_NULLPTR); virtual ~QBarDataProxy(); QBar3DSeries *series() const; @@ -110,7 +110,7 @@ Q_SIGNALS: void seriesChanged(QBar3DSeries *series); protected: - explicit QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent = 0); + explicit QBarDataProxy(QBarDataProxyPrivate *d, QObject *parent = Q_NULLPTR); QBarDataProxyPrivate *dptr(); const QBarDataProxyPrivate *dptrc() const; |