From 39d1cda4e9b276f1b0770027e211aec0d9ecb927 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sat, 23 May 2015 23:40:15 -0700 Subject: [PATCH] UI: Remove dependence on Qt5Network Qt5Network has been replaced by libcurl. --- cmake/Modules/CopyMSVCBins.cmake | 2 -- obs/CMakeLists.txt | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cmake/Modules/CopyMSVCBins.cmake b/cmake/Modules/CopyMSVCBins.cmake index 562fc2f50..ebc1f5c27 100644 --- a/cmake/Modules/CopyMSVCBins.cmake +++ b/cmake/Modules/CopyMSVCBins.cmake @@ -115,7 +115,6 @@ if (CMAKE_CONFIGURATION_TYPES MATCHES "Debug") "${Qt5Core_DIR}/../../../bin/Qt5Cored.dll" "${Qt5Core_DIR}/../../../bin/Qt5Guid.dll" "${Qt5Core_DIR}/../../../bin/Qt5Widgetsd.dll" - "${Qt5Core_DIR}/../../../bin/Qt5Networkd.dll" "${Qt5Core_DIR}/../../../bin/libGLESv2d.dll" "${Qt5Core_DIR}/../../../bin/libEGLd.dll") file(GLOB QT_DEBUG_PLAT_BIN_FILES @@ -127,7 +126,6 @@ if (CMAKE_CONFIGURATION_TYPES MATCHES "Rel") "${Qt5Core_DIR}/../../../bin/Qt5Core.dll" "${Qt5Core_DIR}/../../../bin/Qt5Gui.dll" "${Qt5Core_DIR}/../../../bin/Qt5Widgets.dll" - "${Qt5Core_DIR}/../../../bin/Qt5Network.dll" "${Qt5Core_DIR}/../../../bin/libGLESv2.dll" "${Qt5Core_DIR}/../../../bin/libEGL.dll") file(GLOB QT_PLAT_BIN_FILES diff --git a/obs/CMakeLists.txt b/obs/CMakeLists.txt index 596d19a4b..746bf0ead 100644 --- a/obs/CMakeLists.txt +++ b/obs/CMakeLists.txt @@ -26,9 +26,8 @@ else() endif() find_package(Qt5Widgets ${FIND_MODE}) -find_package(Qt5Network ${FIND_MODE}) -if(NOT Qt5Widgets_FOUND OR NOT Qt5Network_FOUND) +if(NOT Qt5Widgets_FOUND) if (ENABLE_UI) message(FATAL_ERROR "Failed to find Qt5") else() @@ -206,7 +205,6 @@ target_link_libraries(obs libobs libff Qt5::Widgets - Qt5::Network ${LIBCURL_LIBRARIES} ${obs_PLATFORM_LIBRARIES})