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

UI: Remove Qt Windows Extras for Qt 6 and later

Browse source 
Co-Authored-By: Matt Gajownik <matt@wizardcm.com>
This commit is contained in:
Tommy Vercetti 2021-12-13 02:27:56 -06:00 • committed by Jim
commit c83b758f4d
3 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1976,7 +1976,7 @@ void OBSBasic::OBSInit()
SystemTray(true);
#endif
#ifdef _WIN32
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setWindow(windowHandle());
#endif
@ -6542,7 +6542,7 @@ inline void OBSBasic::OnActivate(bool force)
App()->IncrementSleepInhibition();
UpdateProcessPriority();
#ifdef _WIN32
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active", QIcon(":/res/images/active.png")));
#endif
@ -6573,7 +6573,7 @@ inline void OBSBasic::OnDeactivate()
App()->DecrementSleepInhibition();
ClearProcessPriority();
#ifdef _WIN32
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->clearOverlayIcon();
#endif
if (trayIcon && trayIcon->isVisible()) {
@ -6600,7 +6600,7 @@ inline void OBSBasic::OnDeactivate()
#endif
trayIcon->setIcon(QIcon::fromTheme("obs-tray-paused",
trayIconFile));
#ifdef _WIN32
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-paused",
QIcon(":/res/images/paused.png")));
@ -6616,7 +6616,7 @@ inline void OBSBasic::OnDeactivate()
#endif
trayIcon->setIcon(QIcon::fromTheme("obs-tray-active",
trayIconFile));
#ifdef _WIN32
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active",
QIcon(":/res/images/active.png")));
@ -9537,7 +9537,7 @@ void OBSBasic::PauseRecording()
ui->statusbar->RecordingPaused();
#ifdef _WIN32
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-paused", QIcon(":/res/images/paused.png")));
#endif
@ -9581,7 +9581,7 @@ void OBSBasic::UnpauseRecording()
ui->statusbar->RecordingUnpaused();
#ifdef _WIN32
#if defined(_WIN32) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
taskBtn->setOverlayIcon(QIcon::fromTheme(
"obs-active", QIcon(":/res/images/active.png")));
#endif