From 8daefcfd8e1bf41ae4d06c7a79a526b81a78dc58 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Wed, 3 Jul 2019 15:01:35 +0200 Subject: Remove usages of deprecated APIs - Replaced the following deprecated APIs: QWebEngineProfile::setRequestInterceptor -> QWebEngineProfile::setUrlRequestInterceptor QWebEngineSettings::globalSettings -> WebEngineSettings::defaultSettings QLayout::setMargin -> QLayout::setContentsMargins QWheelEvent::{x, y} -> QWheelEvent::position QWheelEvent::{globalX, globalY} -> QWheelEvent::globalPosition QSysInfo::windowsVersion -> QOperatingSystemVersion::current Qt::InputMethodQuery::ImMicroFocus -> Qt::InputMethodQuery::ImCursorRectangle QDesktopWidget::screenGeometry -> QGuiApplication::primaryScreen::geometry QTime -> QElapsedTimer - Fixed the tests to compile when deprecated APIs are disabled. - Replaced the doc references to deprecated APIs with the new ones. Made the docs for deprecated APIs compile conditionally, based on deprecation version. Task-number: QTBUG-76491 Change-Id: I5c6b7c628957deb9163f0bd2b6bc31bde1c7daec Reviewed-by: Allan Sandfeld Jensen --- src/core/web_event_factory.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/core/web_event_factory.cpp') diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index 1b0723cb5..7f5306e67 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -1490,8 +1490,15 @@ blink::WebMouseWheelEvent WebEventFactory::toWebWheelEvent(QWheelEvent *ev) webEvent.SetType(webEventTypeForEvent(ev)); webEvent.SetModifiers(modifiersForEvent(ev)); webEvent.SetTimeStamp(base::TimeTicks::Now()); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) webEvent.SetPositionInWidget(ev->x(), ev->y()); webEvent.SetPositionInScreen(ev->globalX(), ev->globalY()); +#else + webEvent.SetPositionInWidget(static_cast(ev->position().x()), + static_cast(ev->position().y())); + webEvent.SetPositionInScreen(static_cast(ev->globalPosition().x()), + static_cast(ev->globalPosition().y())); +#endif webEvent.wheel_ticks_x = static_cast(ev->angleDelta().x()) / QWheelEvent::DefaultDeltasPerStep; webEvent.wheel_ticks_y = static_cast(ev->angleDelta().y()) / QWheelEvent::DefaultDeltasPerStep; @@ -1520,8 +1527,15 @@ bool WebEventFactory::coalesceWebWheelEvent(blink::WebMouseWheelEvent &webEvent, #endif webEvent.SetTimeStamp(base::TimeTicks::Now()); +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) webEvent.SetPositionInWidget(ev->x(), ev->y()); webEvent.SetPositionInScreen(ev->globalX(), ev->globalY()); +#else + webEvent.SetPositionInWidget(static_cast(ev->position().x()), + static_cast(ev->position().y())); + webEvent.SetPositionInScreen(static_cast(ev->globalPosition().x()), + static_cast(ev->globalPosition().y())); +#endif webEvent.wheel_ticks_x += static_cast(ev->angleDelta().x()) / QWheelEvent::DefaultDeltasPerStep; webEvent.wheel_ticks_y += static_cast(ev->angleDelta().y()) / QWheelEvent::DefaultDeltasPerStep; -- cgit v1.2.3