mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-10 18:46:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

UI: Remove Qt 5 ifdef guards and code

Browse Source
This commit is contained in:
gxalpha
2023-06-10 17:36:11 +02:00
committed by Ryan Foster
parent a44d1b2dce
commit a4834efde9
22 changed files with 4 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
UI/window-basic-interaction.cpp
View File

@@ -176,12 +176,8 @@ void OBSBasicInteraction::closeEvent(QCloseEvent *event)
this);
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
bool OBSBasicInteraction::nativeEvent(const QByteArray &, void *message,
qintptr *)
#else
bool OBSBasicInteraction::nativeEvent(const QByteArray &, void *message, long *)
#endif
{
#ifdef _WIN32
const MSG &msg = *static_cast<MSG *>(message);
@@ -366,14 +362,9 @@ bool OBSBasicInteraction::HandleMouseWheelEvent(QWheelEvent *event)
yDelta = angleDelta.y();
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
const QPointF position = event->position();
const int x = position.x();
const int y = position.y();
#else
const int x = event->x();
const int y = event->y();
#endif
if (GetSourceRelativeXY(x, y, mouseEvent.x, mouseEvent.y)) {
obs_source_send_mouse_wheel(source, &mouseEvent, xDelta,