diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-07-03 15:01:35 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-09-09 11:12:59 +0200 |
| commit | 8daefcfd8e1bf41ae4d06c7a79a526b81a78dc58 (patch) | |
| tree | a0f681b980d852b0b4c08109c0e13cfec6224969 /src/core | |
| parent | d4022e03ccaeb92e41075f276e4011bd49627165 (diff) | |
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 <allan.jensen@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/web_event_factory.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
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<float>(ev->position().x()), + static_cast<float>(ev->position().y())); + webEvent.SetPositionInScreen(static_cast<float>(ev->globalPosition().x()), + static_cast<float>(ev->globalPosition().y())); +#endif webEvent.wheel_ticks_x = static_cast<float>(ev->angleDelta().x()) / QWheelEvent::DefaultDeltasPerStep; webEvent.wheel_ticks_y = static_cast<float>(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<float>(ev->position().x()), + static_cast<float>(ev->position().y())); + webEvent.SetPositionInScreen(static_cast<float>(ev->globalPosition().x()), + static_cast<float>(ev->globalPosition().y())); +#endif webEvent.wheel_ticks_x += static_cast<float>(ev->angleDelta().x()) / QWheelEvent::DefaultDeltasPerStep; webEvent.wheel_ticks_y += static_cast<float>(ev->angleDelta().y()) / QWheelEvent::DefaultDeltasPerStep; |