diff options
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/.prev_CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/CMakeLists.txt | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt index b590c4fb98..27fe778f95 100644 --- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt +++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt @@ -31,7 +31,6 @@ qt_add_plugin(qcocoa qcocoansmenu.h qcocoansmenu.mm qcocoascreen.h qcocoascreen.mm qcocoaservices.h qcocoaservices.mm - qcocoasystemsettings.h qcocoasystemsettings.mm qcocoasystemtrayicon.h qcocoasystemtrayicon.mm qcocoatheme.h qcocoatheme.mm qcocoawindow.h qcocoawindow.mm @@ -112,6 +111,11 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) +qt_extend_target(qcocoa CONDITION QT_FEATURE_sessionmanager + SOURCES + qcocoasessionmanager.cpp qcocoasessionmanager.h +) + qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets SOURCES qpaintengine_mac.mm qpaintengine_mac_p.h @@ -121,7 +125,7 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets Qt::Widgets ) -#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets: +#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets: # QT_FOR_CONFIG = "widgets" qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets @@ -150,5 +154,5 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets qcocoafontdialoghelper.h qcocoafontdialoghelper.mm ) -#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 12:.:.: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 0c76f99790..dbaea562a8 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -35,7 +35,6 @@ qt_add_plugin(qcocoa qcocoansmenu.h qcocoansmenu.mm qcocoascreen.h qcocoascreen.mm qcocoaservices.h qcocoaservices.mm - qcocoasystemsettings.h qcocoasystemsettings.mm qcocoasystemtrayicon.h qcocoasystemtrayicon.mm qcocoatheme.h qcocoatheme.mm qcocoawindow.h qcocoawindow.mm @@ -116,6 +115,11 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility Qt::AccessibilitySupport ) +qt_extend_target(qcocoa CONDITION QT_FEATURE_sessionmanager + SOURCES + qcocoasessionmanager.cpp qcocoasessionmanager.h +) + qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets SOURCES qpaintengine_mac.mm qpaintengine_mac_p.h @@ -125,7 +129,7 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets Qt::Widgets ) -#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets: +#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets: # QT_FOR_CONFIG = "widgets" qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets @@ -154,5 +158,5 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets qcocoafontdialoghelper.h qcocoafontdialoghelper.mm ) -#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 12:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" |