diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-29 14:41:14 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-09-03 09:15:24 +0000 |
| commit | 6f4aa0458c991e3f81154469265899e30fe8121e (patch) | |
| tree | 0a44a02c244748e7c90acef88e5482a7114222d2 /src/plugins/modeleditor | |
| parent | d39d26a54f797ca7900d7e61ff6253b4a8d2d848 (diff) | |
| download | qt-creator-6f4aa0458c991e3f81154469265899e30fe8121e.tar.gz | |
Remove usages of deprecated APIs (part 2)
Replace the uses of deprecated APIs listed below, while keeping in mind
that compatibility with Qt 5.12 (the latest LTS) must be kept. This
means that the new alternatives must be used only when compiling with
Qt versions where the replacement is available.
Replaced:
QLineF::intersect() -> QLine::intersects() (since 5.14)
QComboBox::activated() -> QComboBox::textActivated() (since 5.14)
QWheelEvent::pos() -> QWheelEvent::position() (since 5.14)
QList::swap() -> QList::swapItemsAt() (since 5.13)
Task-number: QTBUG-76491
Change-Id: I62adc4f0826607b0156bf4bc5648ffb0e41cd895
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/modeleditor')
| -rw-r--r-- | src/plugins/modeleditor/editordiagramview.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/modeleditor/editordiagramview.cpp b/src/plugins/modeleditor/editordiagramview.cpp index bf15165c80..c7c93db493 100644 --- a/src/plugins/modeleditor/editordiagramview.cpp +++ b/src/plugins/modeleditor/editordiagramview.cpp @@ -71,10 +71,15 @@ void EditorDiagramView::wheelEvent(QWheelEvent *wheelEvent) { if (wheelEvent->modifiers() == Qt::ControlModifier) { int degree = wheelEvent->angleDelta().y() / 8; +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) + QPoint zoomOrigin = wheelEvent->pos(); +#else + QPoint zoomOrigin = wheelEvent->position().toPoint(); +#endif if (degree > 0) - emit zoomIn(wheelEvent->pos()); + emit zoomIn(zoomOrigin); else if (degree < 0) - emit zoomOut(wheelEvent->pos()); + emit zoomOut(zoomOrigin); } } |