diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-03 11:18:19 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-03 15:48:03 +0200 |
| commit | af3f5b8746a31caf8457590293e3e28101ef85e3 (patch) | |
| tree | 036958faa0566afd9585ad95f5be32c7fdffddf9 /src/plugins | |
| parent | ab8b8c96ef936d189fafee7728bddcc7424e35e5 (diff) | |
CMake: Re-run pro2cmake on gui, platformheaders
platformsupport and plugins/platforms
Change-Id: Id123bc4165387aa867bf4b61ffc3e9dabc2d4780
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/.prev_CMakeLists.txt | 45 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 43 deletions
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index e1e6c49367..ee40e32033 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -13,9 +13,12 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm qcocoabackingstore.h qcocoabackingstore.mm qcocoaclipboard.h qcocoaclipboard.mm + qcocoacolordialoghelper.h qcocoacolordialoghelper.mm qcocoacursor.h qcocoacursor.mm qcocoadrag.h qcocoadrag.mm qcocoaeventdispatcher.h qcocoaeventdispatcher.mm + qcocoafiledialoghelper.h qcocoafiledialoghelper.mm + qcocoafontdialoghelper.h qcocoafontdialoghelper.mm qcocoahelpers.h qcocoahelpers.mm qcocoainputcontext.h qcocoainputcontext.mm qcocoaintegration.h qcocoaintegration.mm @@ -51,12 +54,10 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin ${FWIOSurface} ${FWMetal} ${FWQuartzCore} - Cups::Cups Qt::Core Qt::CorePrivate Qt::Gui Qt::GuiPrivate - Qt::ThemeSupportPrivate ) # Resources: @@ -83,8 +84,6 @@ qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm - PUBLIC_LIBRARIES - Qt::OpenGLPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan @@ -96,8 +95,6 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_accessibility SOURCES qcocoaaccessibility.h qcocoaaccessibility.mm qcocoaaccessibilityelement.h qcocoaaccessibilityelement.mm - PUBLIC_LIBRARIES - Qt::AccessibilitySupportPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager @@ -105,39 +102,5 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager qcocoasessionmanager.cpp qcocoasessionmanager.h ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets - SOURCES - qpaintengine_mac.mm qpaintengine_mac_p.h - PUBLIC_LIBRARIES - Qt::WidgetsPrivate -) - -#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets: -# QT_FOR_CONFIG = "widgets" - -qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets - SOURCES - qcocoaprintdevice.h qcocoaprintdevice.mm - qcocoaprintersupport.h qcocoaprintersupport.mm - qprintengine_mac.mm qprintengine_mac_p.h - PUBLIC_LIBRARIES - Qt::PrintSupportPrivate -) - -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_colordialog AND TARGET Qt::Widgets - SOURCES - qcocoacolordialoghelper.h qcocoacolordialoghelper.mm -) - -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_filedialog AND TARGET Qt::Widgets - SOURCES - qcocoafiledialoghelper.h qcocoafiledialoghelper.mm -) - -qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets - SOURCES - qcocoafontdialoghelper.h qcocoafontdialoghelper.mm -) - -#### Keys ignored in scope 12:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 6:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index 7a61231509..51d7038950 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -16,9 +16,12 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin qcocoaapplicationdelegate.h qcocoaapplicationdelegate.mm qcocoabackingstore.h qcocoabackingstore.mm qcocoaclipboard.h qcocoaclipboard.mm + qcocoacolordialoghelper.h qcocoacolordialoghelper.mm qcocoacursor.h qcocoacursor.mm qcocoadrag.h qcocoadrag.mm qcocoaeventdispatcher.h qcocoaeventdispatcher.mm + qcocoafiledialoghelper.h qcocoafiledialoghelper.mm + qcocoafontdialoghelper.h qcocoafontdialoghelper.mm qcocoahelpers.h qcocoahelpers.mm qcocoainputcontext.h qcocoainputcontext.mm qcocoaintegration.h qcocoaintegration.mm @@ -91,8 +94,6 @@ qt_add_resource(QCocoaIntegrationPlugin "qcocoaresources" qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl SOURCES qcocoaglcontext.h qcocoaglcontext.mm - PUBLIC_LIBRARIES - Qt::OpenGLPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_vulkan |