diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-16 11:43:01 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-16 11:43:01 +0200 |
| commit | a6f81dd33f2449437a16d841af1ff3acf6eb09a6 (patch) | |
| tree | 597f933752c4ffc2c9c8079e1a1e0e595e4bb39f /src/charts/qchartview.cpp | |
| parent | 1b0c37d29ae8775681b968d289d3f8e649178e5b (diff) | |
| parent | 4b534d99fe687c40fb9dd08de6b4f7ebadfb9135 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Iff3e80c784ac4851cb777d9fb1543694a2156c74
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. */ |