diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-31 08:34:32 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-07-31 08:45:07 +0200 |
| commit | 409038e8cba0f4032cdcb4bc8f67138306aea168 (patch) | |
| tree | f4cb5de4a815f597839135c663bd35776b73658b /src/assistant | |
| parent | 61c0d8017044263dde21f1db57383f6d19f9eb03 (diff) | |
Fix deprecation warnings
../../../shared/qtgradienteditor/qtgradientstopswidget.cpp:963:31: warning: ‘int QWheelEvent::delta() const’ is deprecated: Use angleDelta() [-Wdeprecated-declarations]
helpviewer_qtb.cpp:280:18: warning: ‘int QWheelEvent::delta() const’ is deprecated: Use angleDelta() [-Wdeprecated-declarations]
shared/previewmanager.cpp:626:84: warning: 'void QWidget::getContentsMargins(int*, int*, int*, int*) const' is deprecated: use contentsMargins() [-Wdeprecated-declarations]
mainwindow.cpp:2812:27: warning: ‘int QWheelEvent::delta() const’ is deprecated: Use angleDelta() [-Wdeprecated-declarations]
Change-Id: Ib6e675b08d1c4445a2333676432129b765da8d0e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/assistant')
| -rw-r--r-- | src/assistant/assistant/helpviewer_qtb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/assistant/assistant/helpviewer_qtb.cpp b/src/assistant/assistant/helpviewer_qtb.cpp index b522e1ba2..f9bdddb52 100644 --- a/src/assistant/assistant/helpviewer_qtb.cpp +++ b/src/assistant/assistant/helpviewer_qtb.cpp @@ -277,7 +277,7 @@ void HelpViewer::wheelEvent(QWheelEvent *e) TRACE_OBJ if (e->modifiers() == Qt::ControlModifier) { e->accept(); - e->delta() > 0 ? scaleUp() : scaleDown(); + e->angleDelta().y() > 0 ? scaleUp() : scaleDown(); } else { QTextBrowser::wheelEvent(e); } |