r24651 by craig - Include Qt6 Network module

scribus-commit scribus-commit at lists.scribus.net
Thu May 27 21:49:05 UTC 2021


Author: craig
Date: Thu May 27 21:49:05 2021
New Revision: 24651

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24651
Log:
Include Qt6 Network module

Modified:
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/scribus/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24651&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Thu May 27 21:49:05 2021
@@ -68,21 +68,29 @@
 #WANT QT6
     message(STATUS "Qt6 Requested")
 	find_package(Qt6 COMPONENTS Core REQUIRED)
+	add_definitions(${Qt6Core_DEFINITIONS})
+	include_directories(${Qt6Core_INCLUDE_DIRS})
+
 	find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
-	find_package(Qt6 COMPONENTS Gui REQUIRED)
-	find_package(Qt6 COMPONENTS Widgets REQUIRED)
-	include_directories(${Qt6Core_INCLUDE_DIRS})
-	add_definitions(${Qt6Core_DEFINITIONS})
 	include_directories(${Qt6Core5Compat_INCLUDE_DIRS})
 	add_definitions(${Qt6Core5Compat_DEFINITIONS})
+
+	find_package(Qt6 COMPONENTS Gui REQUIRED)
+	include_directories(${Qt6Gui_INCLUDE_DIRS})
+	add_definitions(${Qt6Gui_DEFINITIONS})
+
+	find_package(Qt6 COMPONENTS Widgets REQUIRED)
 	include_directories(${Qt6Widgets_INCLUDE_DIRS})
 	add_definitions(${Qt6Widgets_DEFINITIONS})
-	include_directories(${Qt6Gui_INCLUDE_DIRS})
-	add_definitions(${Qt6Gui_DEFINITIONS})
-#	include_directories(${Qt5Xml_INCLUDE_DIRS})
+
+	find_package(Qt6 COMPONENTS Network REQUIRED)
+	include_directories(${Qt6Network_INCLUDE_DIRS})
+	add_definitions(${Qt6Network_DEFINITIONS})
+
+
+	#	include_directories(${Qt5Xml_INCLUDE_DIRS})
 #	add_definitions(${Qt5Xml_DEFINITIONS})
-#	include_directories(${Qt5Network_INCLUDE_DIRS})
-#	add_definitions(${Qt5Network_DEFINITIONS})
+
 #	include_directories(${Qt5OpenGL_INCLUDE_DIRS})
 #	add_definitions(${Qt5OpenGL_DEFINITIONS})
 #	include_directories(${Qt5PrintSupport_INCLUDE_DIRS})

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24651&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Thu May 27 21:49:05 2021
@@ -795,6 +795,7 @@
 		Qt6::Core5Compat
 		Qt6::Gui
 		Qt6::Widgets
+		Qt6::Network
 		)
 endif()
 




More information about the scribus-commit mailing list