rebase to latest upstream

0001-Revert-UI-Enforce-Fusion-Qt-style-on-Linux.patch

@@ -0,0 +1,44 @@
+From 7ab23d599d91fb8ce747fda7a6392b49a04c061c Mon Sep 17 00:00:00 2001
+From: Thomas Crider <gloriouseggroll@gmail.com>
+Date: Mon, 1 Aug 2022 15:13:28 -0600
+Subject: [PATCH] Revert "UI: Enforce Fusion Qt style on Linux"
+
+This breaks title bar light/dark theme following, and OBS applies a custom theme anyway
+
+This reverts commit 6d06052c51ba453b4c75a655597c97f9f55ad134.
+---
+ UI/obs-app.cpp | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
+
+diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
+index 91a7196f8..558fc3fb1 100644
+--- a/UI/obs-app.cpp
++++ b/UI/obs-app.cpp
+@@ -2172,14 +2172,8 @@ static int run_program(fstream &logFile, int argc, char *argv[])
+ 	}
+ #endif
+ 
+-#if !defined(_WIN32) && !defined(__APPLE__)
+-	/* NOTE: The Breeze Qt style plugin adds frame arround QDockWidget with
+-	 * QPainter which can not be modifed. To avoid this the base style is
+-	 * enforce to the Qt default style on Linux: Fusion. */
+-
+-	setenv("QT_STYLE_OVERRIDE", "Fusion", false);
+-
+-#if defined(ENABLE_WAYLAND) && defined(USE_XDG)
++#if !defined(_WIN32) && !defined(__APPLE__) && defined(USE_XDG) && \
++	defined(ENABLE_WAYLAND)
+ 	/* 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
+@@ -2188,7 +2182,6 @@ static int run_program(fstream &logFile, int argc, char *argv[])
+ 	const char *session_type = getenv("XDG_SESSION_TYPE");
+ 	if (session_type && strcmp(session_type, "wayland") == 0)
+ 		setenv("QT_QPA_PLATFORM", "wayland", false);
+-#endif
+ #endif
+ 
+ 	OBSApp program(argc, argv, profilerNameStore.get());
+-- 
+2.37.1
+