QShortcut: Properly port to the new configure system

Move the feature to corelib so that the QMetaType enumeration
values can be properly excluded and there is no need for a
dummy class.

Use QT_REQUIRE_CONFIG in the headers of classes to be disabled.
Add headers/source files in the .pro file depending on the configure
feature in libraries and tests.
Add the necessary exclusions and use QT_CONFIG.

Task-number: QTBUG-76493
Change-Id: I02499ebee1a3d6d9a1e5afd02517beed5f4536b7
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
index 693af7eb80..8115741b6e 100644
--- a/src/widgets/kernel/kernel.pri
+++ b/src/widgets/kernel/kernel.pri
@@ -20,8 +20,7 @@ HEADERS += \
 	kernel/qlayout_p.h \
 	kernel/qlayoutengine_p.h \
 	kernel/qlayoutitem.h \
-        kernel/qshortcut.h \
-	kernel/qsizepolicy.h \
+        kernel/qsizepolicy.h \
         kernel/qstackedlayout.h \
         kernel/qwidget.h \
         kernel/qwidget_p.h \
@@ -47,7 +46,6 @@ SOURCES += \
         kernel/qlayout.cpp \
 	kernel/qlayoutengine.cpp \
 	kernel/qlayoutitem.cpp \
-        kernel/qshortcut.cpp \
         kernel/qsizepolicy.cpp \
         kernel/qstackedlayout.cpp \
 	kernel/qwidget.cpp \
@@ -77,6 +75,11 @@ qtConfig(formlayout) {
     SOURCES += kernel/qformlayout.cpp
 }
 
+qtConfig(shortcut) {
+    HEADERS += kernel/qshortcut.h
+    SOURCES += kernel/qshortcut.cpp
+}
+
 qtConfig(tooltip) {
     HEADERS += kernel/qtooltip.h
     SOURCES += kernel/qtooltip.cpp