mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-19 20:32:15 +02:00
Code

UI: Remove legacy Qt workarounds (Ubuntu 22.04)

Browse Source
This commit is contained in:
derrod 2024-08-18 03:10:29 +02:00 committed by Ryan Foster
parent b0e1eced04
commit 834c15e717
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UI/obs-app.cpp
View File

@ -1995,20 +1995,6 @@ static int run_program(fstream &logFile, int argc, char *argv[])
const char *platform_theme = getenv("QT_QPA_PLATFORMTHEME");
if (platform_theme && strcmp(platform_theme, "qt5ct") == 0)
unsetenv("QT_QPA_PLATFORMTHEME");
#if defined(ENABLE_WAYLAND) && defined(USE_XDG) && \
QT_VERSION < QT_VERSION_CHECK(6, 3, 0)
/* NOTE: Qt doesn't use the Wayland platform on GNOME, so we have to
* force it using the QT_QPA_PLATFORM env var. It's still possible to
* use other QPA platforms using this env var, or the -platform command
* line option. Remove after Qt 6.3 is everywhere. */
const char *desktop = getenv("XDG_CURRENT_DESKTOP");
const char *session_type = getenv("XDG_SESSION_TYPE");
if (session_type && desktop && strstr(desktop, "GNOME") != nullptr &&
strcmp(session_type, "wayland") == 0)
setenv("QT_QPA_PLATFORM", "wayland", false);
#endif
#endif
/* NOTE: This disables an optimisation in Qt that attempts to determine if

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

@ -3787,14 +3787,7 @@ void OBSBasic::HideAudioControl()
if (!SourceMixerHidden(source)) {
SetSourceMixerHidden(source, true);
/* Due to a bug with QT 6.2.4, the version that's in the Ubuntu
* 22.04 ppa, hiding the audio mixer causes a crash, so defer to
* the next event loop to hide it. Doesn't seem to be a problem
* with newer versions of QT. */
QMetaObject::invokeMethod(this, "DeactivateAudioSource",
Qt::QueuedConnection,
Q_ARG(OBSSource, OBSSource(source)));
DeactivateAudioSource(source);
}
}