Browse Source

UI: Force plugins to use version appropriate Qt Network

Make building against either Qt5 or Qt6 easier by checking the Qt
version used and loading the appropriate Qt Network DLL.
Ryan Foster 4 years ago
parent
commit
37971e7bf9
1 changed files with 5 additions and 1 deletions
  1. 5 1
      UI/window-basic-main.cpp

+ 5 - 1
UI/window-basic-main.cpp

@@ -1746,10 +1746,14 @@ void OBSBasic::OBSInit()
 	InitOBSCallbacks();
 	InitHotkeys();
 
-	/* hack to prevent elgato from loading its own Qt5Network that it tries
+	/* hack to prevent elgato from loading its own QtNetwork that it tries
 	 * to ship with */
 #if defined(_WIN32) && !defined(_DEBUG)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 	LoadLibraryW(L"Qt5Network");
+#else
+	LoadLibraryW(L"Qt6Network");
+#endif
 #endif
 
 	AddExtraModulePaths();