From d445f9f9b6b93e0b73d0d86ec599dc6704706d29 Mon Sep 17 00:00:00 2001 From: Ryan Foster Date: Thu, 25 Mar 2021 23:22:00 -0400 Subject: [PATCH] UI: Remove ifdefs for Qt 5.9 and older Among the systems we officially support, the oldest Qt version is Qt 5.9 on Ubuntu 18.04. We should be able to safely remove these ifdefs. --- UI/window-basic-main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index bd39e6d3c..a8cbaa0c9 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -4741,7 +4741,7 @@ void OBSBasic::AddProjectorMenuMonitors(QMenu *parent, QObject *target, fullname << ")"; #elif defined(__APPLE__) name = screen->name(); -#elif QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) +#else name = screen->model().simplified(); if (name.length() > 1 && name.endsWith("-")) @@ -8006,7 +8006,6 @@ void OBSBasic::on_resetUI_triggered() restoreState(startingDockLayout); -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) int cx = width(); int cy = height(); @@ -8033,7 +8032,6 @@ void OBSBasic::on_resetUI_triggered() resizeDocks(docks, {cy, cy, cy, cy, cy}, Qt::Vertical); resizeDocks(docks, sizes, Qt::Horizontal); -#endif activateWindow(); }