OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Force plugins to use version appropriate Qt Network

Browse source 
Make building against either Qt5 or Qt6 easier by checking the Qt
version used and loading the appropriate Qt Network DLL.
This commit is contained in:
Ryan Foster 2021-03-09 09:10:59 -05:00
parent 513bcb8e35
commit 37971e7bf9
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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();