diff options
| -rw-r--r-- | src/plugins/platformthemes/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/printsupport/.prev_CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/printsupport/CMakeLists.txt | 26 |
3 files changed, 14 insertions, 17 deletions
diff --git a/src/plugins/platformthemes/CMakeLists.txt b/src/plugins/platformthemes/CMakeLists.txt index a0e8383ba2..a3c1f4fa9b 100644 --- a/src/plugins/platformthemes/CMakeLists.txt +++ b/src/plugins/platformthemes/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from platformthemes.pro. -if(QT_FEATURE_dbus AND QT_FEATURE_mimetype AND QT_FEATURE_regularexpression AND NOT APPLE AND NOT WIN32) +if(QT_FEATURE_dbus AND QT_FEATURE_mimetype AND QT_FEATURE_regularexpression AND UNIX AND NOT APPLE) add_subdirectory(xdgdesktopportal) endif() if(QT_FEATURE_gtk3 AND TARGET Qt::Widgets) diff --git a/src/plugins/printsupport/.prev_CMakeLists.txt b/src/plugins/printsupport/.prev_CMakeLists.txt index a1f39cb843..14b36b4b7f 100644 --- a/src/plugins/printsupport/.prev_CMakeLists.txt +++ b/src/plugins/printsupport/.prev_CMakeLists.txt @@ -1,8 +1,5 @@ # Generated from printsupport.pro. -if(MACOS) - add_subdirectory(cocoa) -endif() if(WIN32) add_subdirectory(windows) endif() diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt index e310296002..65c7a945a3 100644 --- a/src/printsupport/CMakeLists.txt +++ b/src/printsupport/CMakeLists.txt @@ -44,6 +44,19 @@ qt_add_module(PrintSupport ## Scopes: ##################################################################### +qt_extend_target(PrintSupport CONDITION MACOS + SOURCES + platform/macos/qcocoaprintdevice.mm platform/macos/qcocoaprintdevice_p.h + platform/macos/qcocoaprintersupport.mm platform/macos/qcocoaprintersupport_p.h + platform/macos/qpaintengine_mac.mm platform/macos/qpaintengine_mac_p.h + platform/macos/qprintengine_mac.mm platform/macos/qprintengine_mac_p.h + PUBLIC_LIBRARIES + ${FWApplicationServices} + Cups::Cups + NO_PCH_SOURCES + "platform/macos/qcocoaprintersupport.mm" +) + qt_extend_target(PrintSupport CONDITION QT_FEATURE_printpreviewwidget SOURCES kernel/qpaintengine_preview.cpp kernel/qpaintengine_preview_p.h @@ -140,19 +153,6 @@ if(QT_FEATURE_printdialog) ) endif() -qt_extend_target(PrintSupport CONDITION MACOS AND TARGET Qt::Widgets - SOURCES - platform/macos/qpaintengine_mac.mm platform/macos/qpaintengine_mac_p.h - platform/macos/qcocoaprintdevice_p.h platform/macos/qcocoaprintdevice.mm - platform/macos/qcocoaprintersupport_p.h platform/macos/qcocoaprintersupport.mm - platform/macos/qprintengine_mac.mm platform/macos/qprintengine_mac_p.h - NO_PCH_SOURCES - "platform/macos/qcocoaprintersupport.mm" - PUBLIC_LIBRARIES - Qt::WidgetsPrivate - Cups::Cups -) - qt_extend_target(PrintSupport CONDITION MACOS AND QT_FEATURE_printdialog SOURCES dialogs/qpagesetupdialog_mac.mm |