Browse Source

UI: Remove dependence on Qt5Network

Qt5Network has been replaced by libcurl.
jp9000 10 years ago
parent
commit
39d1cda4e9
2 changed files with 1 additions and 5 deletions
  1. 0 2
      cmake/Modules/CopyMSVCBins.cmake
  2. 1 3
      obs/CMakeLists.txt

+ 0 - 2
cmake/Modules/CopyMSVCBins.cmake

@@ -115,7 +115,6 @@ if (CMAKE_CONFIGURATION_TYPES MATCHES "Debug")
 		"${Qt5Core_DIR}/../../../bin/Qt5Cored.dll"
 		"${Qt5Core_DIR}/../../../bin/Qt5Cored.dll"
 		"${Qt5Core_DIR}/../../../bin/Qt5Guid.dll"
 		"${Qt5Core_DIR}/../../../bin/Qt5Guid.dll"
 		"${Qt5Core_DIR}/../../../bin/Qt5Widgetsd.dll"
 		"${Qt5Core_DIR}/../../../bin/Qt5Widgetsd.dll"
-		"${Qt5Core_DIR}/../../../bin/Qt5Networkd.dll"
 		"${Qt5Core_DIR}/../../../bin/libGLESv2d.dll"
 		"${Qt5Core_DIR}/../../../bin/libGLESv2d.dll"
 		"${Qt5Core_DIR}/../../../bin/libEGLd.dll")
 		"${Qt5Core_DIR}/../../../bin/libEGLd.dll")
 	file(GLOB QT_DEBUG_PLAT_BIN_FILES
 	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/Qt5Core.dll"
 		"${Qt5Core_DIR}/../../../bin/Qt5Gui.dll"
 		"${Qt5Core_DIR}/../../../bin/Qt5Gui.dll"
 		"${Qt5Core_DIR}/../../../bin/Qt5Widgets.dll"
 		"${Qt5Core_DIR}/../../../bin/Qt5Widgets.dll"
-		"${Qt5Core_DIR}/../../../bin/Qt5Network.dll"
 		"${Qt5Core_DIR}/../../../bin/libGLESv2.dll"
 		"${Qt5Core_DIR}/../../../bin/libGLESv2.dll"
 		"${Qt5Core_DIR}/../../../bin/libEGL.dll")
 		"${Qt5Core_DIR}/../../../bin/libEGL.dll")
 	file(GLOB QT_PLAT_BIN_FILES
 	file(GLOB QT_PLAT_BIN_FILES

+ 1 - 3
obs/CMakeLists.txt

@@ -26,9 +26,8 @@ else()
 endif()
 endif()
 
 
 find_package(Qt5Widgets ${FIND_MODE})
 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)
 	if (ENABLE_UI)
 		message(FATAL_ERROR "Failed to find Qt5")
 		message(FATAL_ERROR "Failed to find Qt5")
 	else()
 	else()
@@ -206,7 +205,6 @@ target_link_libraries(obs
 	libobs
 	libobs
 	libff
 	libff
 	Qt5::Widgets
 	Qt5::Widgets
-	Qt5::Network
 	${LIBCURL_LIBRARIES}
 	${LIBCURL_LIBRARIES}
 	${obs_PLATFORM_LIBRARIES})
 	${obs_PLATFORM_LIBRARIES})