Merge conflict

This commit is contained in:
TechnoHector 2024-04-04 22:16:09 -04:00
commit f4eccb56b8

View file

@ -77,6 +77,7 @@
#include <QSysInfo> #include <QSysInfo>
#include <QUrl> #include <QUrl>
#include <QtConcurrent/QtConcurrent> #include <QtConcurrent/QtConcurrent>
#include <QDesktopWidget>
#ifdef HAVE_SDL2 #ifdef HAVE_SDL2
#include <SDL.h> // For SDL ScreenSaver functions #include <SDL.h> // For SDL ScreenSaver functions