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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/charts/qchartview.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/charts/qchartview.cpp b/src/charts/qchartview.cpp index b8936f03..0da6e18a 100644 --- a/src/charts/qchartview.cpp +++ b/src/charts/qchartview.cpp @@ -261,6 +261,17 @@ void QChartView::mouseReleaseEvent(QMouseEvent *event) #endif } +#ifdef Q_OS_MACOS +#if QT_CONFIG(wheelevent) +void QChartView::wheelEvent(QWheelEvent *event) +{ + Q_UNUSED(event) + // We just need to override wheelEvent, or scrolling won't work correctly on macOS trackpad + // (QTBUG-77403) +} +#endif +#endif + /*! Resizes and updates the chart area using the data specified by \a event. */ |