diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:03:57 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:03:57 +0200 |
| commit | b92958a299221678ae3cac4d57d1a67cbaf0270d (patch) | |
| tree | 6c3b6c7916f3c46cf9d81514968856d74dd137fc /src/charts/qchartview.h | |
| parent | 26277a94e10b9bb542017be369c95f399eba6213 (diff) | |
| parent | 88e67e7686fa564e81a770a18879cc281e620222 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I6d6b7e405d4023a17e49c001040894980dca0c95
Diffstat (limited to 'src/charts/qchartview.h')
| -rw-r--r-- | src/charts/qchartview.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/charts/qchartview.h b/src/charts/qchartview.h index f8056487..f41fe56e 100644 --- a/src/charts/qchartview.h +++ b/src/charts/qchartview.h @@ -70,10 +70,15 @@ public: void setChart(QChart *chart); protected: - void resizeEvent(QResizeEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void resizeEvent(QResizeEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; +#ifdef Q_OS_MACOS +#if QT_CONFIG(wheelevent) + void wheelEvent(QWheelEvent *event) override; +#endif +#endif QScopedPointer<QChartViewPrivate> d_ptr; |