RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 07:47:35 +00:00
Code Issues Activity Actions

Ladybird: Stop using deprecated Qt API and re-enable deprecated warnings

Browse source
This commit is contained in:
Andreas Kling 2022-07-05 21:20:48 +02:00 • committed by Andrew Kaster
parent 419d3ec646
commit f96b53f118
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ladybird/CMakeLists.txt
View file

@ -32,9 +32,6 @@ add_compile_options(-Wno-expansion-to-defined)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
find_package(Qt6 REQUIRED COMPONENTS Core Widgets Network) find_package(Qt6 REQUIRED COMPONENTS Core Widgets Network)
# FIXME: Stop using deprecated declarations from QT :^)
add_compile_options(-Wno-deprecated-declarations)
set(SOURCES set(SOURCES
BrowserWindow.cpp BrowserWindow.cpp
RequestManagerQt.cpp RequestManagerQt.cpp

6
Ladybird/WebView.cpp
View file

@ -340,7 +340,7 @@ unsigned get_modifiers_from_qt_event(QMouseEvent const& event)
void WebView::mouseMoveEvent(QMouseEvent* event) void WebView::mouseMoveEvent(QMouseEvent* event)
{ {
Gfx::IntPoint position(event->x() / m_inverse_pixel_scaling_ratio, event->y() / m_inverse_pixel_scaling_ratio); Gfx::IntPoint position(event->position().x() / m_inverse_pixel_scaling_ratio, event->position().y() / m_inverse_pixel_scaling_ratio);
auto buttons = get_buttons_from_qt_event(*event); auto buttons = get_buttons_from_qt_event(*event);
auto modifiers = get_modifiers_from_qt_event(*event); auto modifiers = get_modifiers_from_qt_event(*event);
m_page_client->page().handle_mousemove(to_content(position), buttons, modifiers); m_page_client->page().handle_mousemove(to_content(position), buttons, modifiers);
@ -348,7 +348,7 @@ void WebView::mouseMoveEvent(QMouseEvent* event)
void WebView::mousePressEvent(QMouseEvent* event) void WebView::mousePressEvent(QMouseEvent* event)
{ {
Gfx::IntPoint position(event->x() / m_inverse_pixel_scaling_ratio, event->y() / m_inverse_pixel_scaling_ratio); Gfx::IntPoint position(event->position().x() / m_inverse_pixel_scaling_ratio, event->position().y() / m_inverse_pixel_scaling_ratio);
auto button = get_button_from_qt_event(*event); auto button = get_button_from_qt_event(*event);
auto modifiers = get_modifiers_from_qt_event(*event); auto modifiers = get_modifiers_from_qt_event(*event);
m_page_client->page().handle_mousedown(to_content(position), button, modifiers); m_page_client->page().handle_mousedown(to_content(position), button, modifiers);
@ -356,7 +356,7 @@ void WebView::mousePressEvent(QMouseEvent* event)
void WebView::mouseReleaseEvent(QMouseEvent* event) void WebView::mouseReleaseEvent(QMouseEvent* event)
{ {
Gfx::IntPoint position(event->x() / m_inverse_pixel_scaling_ratio, event->y() / m_inverse_pixel_scaling_ratio); Gfx::IntPoint position(event->position().x() / m_inverse_pixel_scaling_ratio, event->position().y() / m_inverse_pixel_scaling_ratio);
auto button = get_button_from_qt_event(*event); auto button = get_button_from_qt_event(*event);
auto modifiers = get_modifiers_from_qt_event(*event); auto modifiers = get_modifiers_from_qt_event(*event);
m_page_client->page().handle_mouseup(to_content(position), button, modifiers); m_page_client->page().handle_mouseup(to_content(position), button, modifiers);