diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 10:42:05 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:29:18 +0000 |
| commit | 48c82e90af12da74c713665ddfd7f8d825ae5bdb (patch) | |
| tree | 0efa87b0cd1b00c47fce0b566a7a0cbb35fed786 /src/plugins | |
| parent | 502d3d6744913899da87acfda5ebdab42c40329e (diff) | |
Post Merge Fixes
Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/plugins')
4 files changed, 16 insertions, 18 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 = "-" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt index 2e8819182c..51b3327345 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt @@ -9,6 +9,7 @@ qt_add_module(EglFsKmsSupport NO_MODULE_HEADERS SOURCES qeglfskmsdevice.cpp qeglfskmsdevice.h + qeglfskmseventreader.cpp qeglfskmseventreader.h qeglfskmshelpers.h qeglfskmsintegration.cpp qeglfskmsintegration.h qeglfskmsscreen.cpp qeglfskmsscreen.h diff --git a/src/plugins/styles/windowsvista/CMakeLists.txt b/src/plugins/styles/windowsvista/CMakeLists.txt index bbb9210f10..3304150c3e 100644 --- a/src/plugins/styles/windowsvista/CMakeLists.txt +++ b/src/plugins/styles/windowsvista/CMakeLists.txt @@ -13,12 +13,11 @@ qt_add_plugin(qwindowsvistastyle qwindowsvistastyle_p_p.h qwindowsxpstyle.cpp qwindowsxpstyle_p.h qwindowsxpstyle_p_p.h - INCLUDE_DIRECTORIES - ../3rdparty/wintab LIBRARIES Qt::WidgetsPrivate gdi32 user32 + uxtheme PUBLIC_LIBRARIES Qt::Core Qt::Gui @@ -27,13 +26,3 @@ qt_add_plugin(qwindowsvistastyle #### Keys ignored in scope 1:.:.:windowsvista.pro:<TRUE>: # DISTFILES = "windowsvistastyle.json" - -## Scopes: -##################################################################### - -qt_extend_target(qwindowsvistastyle CONDITION NOT WINRT - LIBRARIES - dwmapi - shell32 - uxtheme -) |