Post merge fixes

Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

3 files changed, 33 insertions, 17 deletions

diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 634a2a3209..b90885b2ec 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -44,7 +44,6 @@ qt_add_module(Gui
         kernel/qinputmethod.cpp kernel/qinputmethod.h kernel/qinputmethod_p.h
         kernel/qinternalmimedata.cpp kernel/qinternalmimedata_p.h
         kernel/qkeymapper.cpp kernel/qkeymapper_p.h
-        kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
         kernel/qoffscreensurface.cpp kernel/qoffscreensurface.h
         kernel/qpaintdevicewindow.cpp kernel/qpaintdevicewindow.h kernel/qpaintdevicewindow_p.h
         kernel/qpalette.cpp kernel/qpalette.h
@@ -76,7 +75,6 @@ qt_add_module(Gui
         kernel/qrasterwindow.cpp kernel/qrasterwindow.h
         kernel/qscreen.cpp kernel/qscreen.h kernel/qscreen_p.h
         kernel/qsessionmanager.cpp kernel/qsessionmanager.h kernel/qsessionmanager_p.h
-        kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
         kernel/qstylehints.cpp kernel/qstylehints.h
         kernel/qsurface.cpp kernel/qsurface.h
         kernel/qsurfaceformat.cpp kernel/qsurfaceformat.h
@@ -396,6 +394,12 @@ qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
         ${FWFoundation}
 )
 
+qt_extend_target(Gui CONDITION QT_FEATURE_action
+    SOURCES
+        kernel/qguiaction.cpp kernel/qguiaction.h kernel/qguiaction_p.h
+        kernel/qguiactiongroup.cpp kernel/qguiactiongroup.h kernel/qguiactiongroup_p.h
+)
+
 qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
     SOURCES
         kernel/qdnd.cpp kernel/qdnd_p.h
@@ -405,6 +409,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
         kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h
 )
 
+qt_extend_target(Gui CONDITION QT_FEATURE_shortcut
+    SOURCES
+        kernel/qguishortcut.cpp kernel/qguishortcut.h kernel/qguishortcut_p.h
+        kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
+        kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
+)
+
 qt_extend_target(Gui CONDITION QT_FEATURE_movie
     SOURCES
         image/qmovie.cpp image/qmovie.h
@@ -604,7 +615,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
         Vulkan::Vulkan_nolink
 )
 
-#### Keys ignored in scope 78:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
 # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl"
 # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml"
 # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL"
@@ -620,10 +631,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 79:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 81:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 qt_extend_target(Gui CONDITION WASM
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 9aab20bd9e..ad35c0ef7b 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -87,7 +87,6 @@ qt_add_module(Gui
         kernel/qinputmethod.cpp kernel/qinputmethod.h kernel/qinputmethod_p.h
         kernel/qinternalmimedata.cpp kernel/qinternalmimedata_p.h
         kernel/qkeymapper.cpp kernel/qkeymapper_p.h
-        kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
         kernel/qoffscreensurface.cpp kernel/qoffscreensurface.h
         kernel/qpaintdevicewindow.cpp kernel/qpaintdevicewindow.h kernel/qpaintdevicewindow_p.h
         kernel/qpalette.cpp kernel/qpalette.h
@@ -119,7 +118,6 @@ qt_add_module(Gui
         kernel/qrasterwindow.cpp kernel/qrasterwindow.h
         kernel/qscreen.cpp kernel/qscreen.h kernel/qscreen_p.h
         kernel/qsessionmanager.cpp kernel/qsessionmanager.h kernel/qsessionmanager_p.h
-        kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
         kernel/qstylehints.cpp kernel/qstylehints.h
         kernel/qsurface.cpp kernel/qsurface.h
         kernel/qsurfaceformat.cpp kernel/qsurfaceformat.h
@@ -478,6 +476,12 @@ qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
         ${FWFoundation}
 )
 
+qt_extend_target(Gui CONDITION QT_FEATURE_action
+    SOURCES
+        kernel/qguiaction.cpp kernel/qguiaction.h kernel/qguiaction_p.h
+        kernel/qguiactiongroup.cpp kernel/qguiactiongroup.h kernel/qguiactiongroup_p.h
+)
+
 qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
     SOURCES
         kernel/qdnd.cpp kernel/qdnd_p.h
@@ -487,6 +491,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
         kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h
 )
 
+qt_extend_target(Gui CONDITION QT_FEATURE_shortcut
+    SOURCES
+        kernel/qguishortcut.cpp kernel/qguishortcut.h kernel/qguishortcut_p.h
+        kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
+        kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
+)
+
 qt_extend_target(Gui CONDITION QT_FEATURE_movie
     SOURCES
         image/qmovie.cpp image/qmovie.h
@@ -746,10 +757,10 @@ endif()
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 79:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 81:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 qt_extend_target(Gui CONDITION WASM
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 0ff1b3bfc4..932132a5f8 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -918,16 +918,10 @@ qt_feature("draganddrop" PUBLIC
     CONDITION QT_FEATURE_imageformat_xpm
 )
 qt_feature_definition("draganddrop" "QT_NO_DRAGANDDROP" NEGATE VALUE "1")
-qt_feature("shortcut" PUBLIC
-    SECTION "Kernel"
-    LABEL "QShortcut"
-    PURPOSE "Provides keyboard accelerators and shortcuts."
-)
-qt_feature_definition("shortcut" "QT_NO_SHORTCUT" NEGATE VALUE "1")
 qt_feature("action" PUBLIC
     SECTION "Kernel"
-    LABEL "QAction"
-    PURPOSE "Provides widget actions."
+    LABEL "Q(Gui)Action(Group)"
+    PURPOSE "Provides abstract user interface actions."
 )
 qt_feature_definition("action" "QT_NO_ACTION" NEGATE VALUE "1")
 qt_feature("cursor" PUBLIC