1 files changed, 8 insertions, 12 deletions
diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt
index 330f44c689..c24d04d2ce 100644
--- a/src/printsupport/CMakeLists.txt
+++ b/src/printsupport/CMakeLists.txt
@@ -14,14 +14,16 @@ qt_internal_add_module(PrintSupport
         kernel/qplatformprintplugin.cpp kernel/qplatformprintplugin.h
         kernel/qprint.cpp kernel/qprint_p.h
         kernel/qprintdevice.cpp kernel/qprintdevice_p.h
-        kernel/qprintengine.h
+        kernel/qprintengine.cpp kernel/qprintengine.h
         kernel/qprintengine_pdf.cpp kernel/qprintengine_pdf_p.h
         kernel/qprinter.cpp kernel/qprinter.h kernel/qprinter_p.h
         kernel/qprinterinfo.cpp kernel/qprinterinfo.h kernel/qprinterinfo_p.h
         kernel/qtprintsupportglobal.h kernel/qtprintsupportglobal_p.h
     DEFINES
+        QT_NO_CONTEXTLESS_CONNECT
         QT_NO_FOREACH
         QT_NO_USING_NAMESPACE
+        QT_USE_NODISCARD_FILE_OPEN
     INCLUDE_DIRECTORIES
         dialogs
         widgets
@@ -37,7 +39,6 @@ qt_internal_add_module(PrintSupport
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::WidgetsPrivate
-    GENERATE_CPP_EXPORTS
     QPA_HEADER_FILTERS
         "(^|/)qplatform.+\\.h$"
 )
@@ -59,7 +60,7 @@ qt_internal_extend_target(PrintSupport CONDITION MACOS
         ${FWApplicationServices}
         Cups::Cups
     NO_PCH_SOURCES
-        "platform/macos/qcocoaprintersupport.mm"
+        platform/macos/qcocoaprintersupport.mm
 )
 
 qt_internal_extend_target(PrintSupport CONDITION WIN32
@@ -74,13 +75,9 @@ qt_internal_extend_target(PrintSupport CONDITION WIN32
         comdlg32
         winspool
     NO_PCH_SOURCES
-        "platform/windows/qwindowsprintersupport.cpp"
+        platform/windows/qwindowsprintersupport.cpp
 )
 
-set_source_files_properties(platform/macos/qcocoaprintersupport.mm # NO_PCH_SOURCES
-                            platform/windows/qwindowsprintersupport.cpp
-                            PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
-
 qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget
     SOURCES
         kernel/qpaintengine_preview.cpp kernel/qpaintengine_preview_p.h
@@ -181,22 +178,21 @@ qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND WIN3
         dialogs/qprintdialog_win.cpp
 )
 
-qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT APPLE
+qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printdialog AND UNIX AND NOT MACOS
     SOURCES
         dialogs/qpagesetupdialog_unix.cpp dialogs/qpagesetupdialog_unix_p.h
         dialogs/qprintdialog_unix.cpp
         dialogs/qprintpropertieswidget.ui
         dialogs/qprintsettingsoutput.ui
         dialogs/qprintwidget.ui
+    NO_UNITY_BUILD_SOURCES
+        dialogs/qprintdialog_unix.cpp   # Clashes with CUPS headers
     INCLUDE_DIRECTORIES
         ${QtBase_SOURCE_DIR}/src/plugins/printsupport/cups
     ENABLE_AUTOGEN_TOOLS
         uic
 )
 
-# Clashes with CUPS headers
-set_source_files_properties(dialogs/qprintdialog_unix.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
-
 qt_internal_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewdialog
     SOURCES
         dialogs/qprintpreviewdialog.cpp dialogs/qprintpreviewdialog.h