diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b942ad33e..3ab225b66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -252,14 +252,6 @@ jobs: mv ./libobs-opengl/libobs-opengl.so ./OBS.app/Contents/Frameworks - cp -R /tmp/obsdeps/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks - chmod -R +w ./OBS.app/Contents/Frameworks/QtNetwork.framework - rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Headers - rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Headers/ - chmod 644 ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources/Info.plist - install_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork - install_name_tool -change /tmp/obsdeps/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork - cp -R "${{ github.workspace }}/cmbuild/cef_binary_${{ env.MACOS_CEF_BUILD_VERSION }}_macosx64/Release/Chromium Embedded Framework.framework" ./OBS.app/Contents/Frameworks/ chown -R $(whoami) ./OBS.app/Contents/Frameworks/ diff --git a/CI/full-build-macos.sh b/CI/full-build-macos.sh index 6d10d3bd2..370006041 100755 --- a/CI/full-build-macos.sh +++ b/CI/full-build-macos.sh @@ -351,15 +351,6 @@ bundle_dylibs() { else /bin/cp ./libobs-opengl/${BUILD_CONFIG}/libobs-opengl.so ./OBS.app/Contents/Frameworks fi - - step "Copy QtNetwork for plugin support" - /bin/cp -R /tmp/obsdeps/lib/QtNetwork.framework ./OBS.app/Contents/Frameworks - /bin/chmod -R +w ./OBS.app/Contents/Frameworks/QtNetwork.framework - /bin/rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Headers - /bin/rm -r ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Headers/ - /bin/chmod 644 ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/Resources/Info.plist - install_name_tool -id @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork - install_name_tool -change /tmp/obsdeps/lib/QtCore.framework/Versions/5/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore ./OBS.app/Contents/Frameworks/QtNetwork.framework/Versions/5/QtNetwork } install_frameworks() { diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt index 6cbad64b4..f56ef7005 100644 --- a/UI/CMakeLists.txt +++ b/UI/CMakeLists.txt @@ -46,6 +46,7 @@ configure_file( set(CMAKE_INCLUDE_CURRENT_DIR TRUE) set(CMAKE_AUTOMOC TRUE) +find_package(Qt5Network ${FIND_MODE}) find_package(Qt5Widgets ${FIND_MODE}) find_package(Qt5Svg ${FIND_MODE}) find_package(Qt5Xml ${FIND_MODE}) @@ -400,6 +401,7 @@ endif() target_link_libraries(obs libobs + Qt5::Network Qt5::Widgets Qt5::Svg Qt5::Xml