diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-13 13:12:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-03-06 13:18:20 +0000 |
| commit | 32c59d6856285ad25f1dc52cc5428105b674945c (patch) | |
| tree | f726dce458fc7f22257edb653dbcf038b4bb5267 | |
| parent | 25ee3d1c3b05a4e87201effa5b270078778e98ad (diff) | |
cmake: fix cocoa and graphics on macOS
Change-Id: Ia956c74a54874f91cc0ea8e5105164de88890ff2
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/platformsupport/graphics/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/CMakeLists.txt | 10 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0a69798685..a5dfa6a541 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -65,7 +65,7 @@ endif() if (QT_FEATURE_testlib) add_subdirectory(testlib) endif() -if(QT_FEATURE_core AND QT_FEATURE_gui AND QT_FEATURE_widgets) +if(QT_FEATURE_gui AND QT_FEATURE_widgets) add_subdirectory(printsupport) endif() add_subdirectory(plugins) diff --git a/src/platformsupport/graphics/CMakeLists.txt b/src/platformsupport/graphics/CMakeLists.txt index 2846fc024b..c3b8e8e64d 100644 --- a/src/platformsupport/graphics/CMakeLists.txt +++ b/src/platformsupport/graphics/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_module(GraphicsSupport + STATIC SOURCES qrasterbackingstore.cpp qrasterbackingstore_p.h DEFINES diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index a757c40293..66cc2bcd89 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -87,13 +87,13 @@ extend_target(qcocoa CONDITION QT_FEATURE_vulkan extend_target(qcocoa CONDITION QT_FEATURE_widgets SOURCES - # qcocoaprintdevice.h qcocoaprintdevice.mm - # qcocoaprintersupport.h qcocoaprintersupport.mm - # qpaintengine_mac.mm qpaintengine_mac_p.h - # qprintengine_mac.mm qprintengine_mac_p.h + qcocoaprintdevice.h qcocoaprintdevice.mm + qcocoaprintersupport.h qcocoaprintersupport.mm + qpaintengine_mac.mm qpaintengine_mac_p.h + qprintengine_mac.mm qprintengine_mac_p.h LIBRARIES Qt::WidgetsPrivate - # Qt::PrintSupportPrivate + Qt::PrintSupportPrivate ) extend_target(qcocoa CONDITION (QT_FEATURE_widgets) AND (QT_FEATURE_colordialog) |