r24854 by craig - Update Qt6 module dependencies

scribus-commit scribus-commit at lists.scribus.net
Sun Jan 30 14:36:47 UTC 2022


Author: craig
Date: Sun Jan 30 14:36:47 2022
New Revision: 24854

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24854
Log:
Update Qt6 module dependencies

Modified:
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/scribus/pdflib_core.cpp

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24854&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Sun Jan 30 14:36:47 2022
@@ -89,17 +89,22 @@
 	include_directories(${Qt6Network_INCLUDE_DIRS})
 	add_definitions(${Qt6Network_DEFINITIONS})
 
+	find_package(Qt6 COMPONENTS OpenGL REQUIRED)
+	include_directories(${Qt6OpenGL_INCLUDE_DIRS})
+	add_definitions(${Qt6OpenGL_DEFINITIONS})
+
+	find_package(Qt6 COMPONENTS PrintSupport REQUIRED)
+	include_directories(${Qt6PrintSupport_INCLUDE_DIRS})
+	add_definitions(${Qt6PrintSupport_DEFINITIONS})
+
+	find_package(Qt6 COMPONENTS Xml REQUIRED)
+	include_directories(${Qt6Xml_INCLUDE_DIRS})
+	add_definitions(${Qt6Xml_DEFINITIONS})
+
 	find_package(Qt6 COMPONENTS LinguistTools REQUIRED)
 	include_directories(${Qt6LinguistTools_INCLUDE_DIRS})
 	add_definitions(${Qt6LinguistTools_DEFINITIONS})
 
-	#	include_directories(${Qt5Xml_INCLUDE_DIRS})
-#	add_definitions(${Qt5Xml_DEFINITIONS})
-
-#	include_directories(${Qt5OpenGL_INCLUDE_DIRS})
-#	add_definitions(${Qt5OpenGL_DEFINITIONS})
-#	include_directories(${Qt5PrintSupport_INCLUDE_DIRS})
-#	add_definitions(${Qt5PrintSupport_DEFINITIONS})
 	message(STATUS "Qt Version Found: ${Qt6Widgets_VERSION}")
 endif()
 

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24854&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Sun Jan 30 14:36:47 2022
@@ -56,6 +56,7 @@
 #include <QString>
 #include <QTemporaryFile>
 #include <QTextCodec>
+#include <QDomDocument>
 #include <QUuid>
 
 #include "cmsettings.h"




More information about the scribus-commit mailing list