Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

frontend: Enforce Qt to have a DE-agnostic behavior on Linux #11815

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

frontend: Enforce Qt to have a DE-agnostic behavior on Linux #11815

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions frontend/obs-main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,12 +526,15 @@ static int run_program(fstream &logFile, int argc, char *argv[])
#endif

#if !defined(_WIN32) && !defined(__APPLE__)
/* NOTE: Users blindly set this, but this theme is incompatble with Qt6 and
* crashes loading saved geometry. Just turn off this theme and let users complain OBS
* looks ugly instead of crashing. */
const char *platform_theme = getenv("QT_QPA_PLATFORMTHEME");
if (platform_theme && strcmp(platform_theme, "qt5ct") == 0)
unsetenv("QT_QPA_PLATFORMTHEME");
/* NOTE: This will prevent users and Qt itself to pick a platform theme that might enforce some undesired
* choice on the behavior of Qt.
* "xdgdesktopportal" is also the default when Qt is built without GTK 3 support.*/
qputenv("QT_QPA_PLATFORMTHEME", "xdgdesktopportal");

/* NOTE: "bradient" is the default decoration provided by Qt.
* But since Qt 6.8, GNOME-like decoration were added to allow Qt apps to "fit" on GNOME.
* The same look on all DE is preferred */
qputenv("QT_WAYLAND_DECORATION", "bradient");
#endif

/* NOTE: This disables an optimisation in Qt that attempts to determine if
Expand Down
Loading