4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Remove ifdefs for Qt 5.9 and older

Browse source 
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.
This commit is contained in:
Ryan Foster 2021-03-25 23:22:00 -04:00 • committed by Jim
commit d445f9f9b6
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
UI/window-basic-main.cpp
View file

@ -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();
}