1 files changed, 26 insertions, 20 deletions
diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt
index 2c2a9fa1cc..b7ff09d827 100644
--- a/src/platformsupport/input/CMakeLists.txt
+++ b/src/platformsupport/input/CMakeLists.txt
@@ -1,15 +1,17 @@
-# Generated from input.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
-qt_find_package(Libinput) # special case
-qt_find_package(XKB) # special case
-qt_find_package(Tslib) # special case
-qt_find_package(Mtdev) # special case
+qt_find_package(Libinput)
+qt_find_package(XKB)
+qt_find_package(Tslib)
+qt_find_package(Mtdev)
 
 #####################################################################
-## InputSupport Module:
+## InputSupportPrivate Module:
 #####################################################################
 
-qt_add_module(InputSupport
+qt_internal_add_module(InputSupportPrivate
+    CONFIG_MODULE_NAME input_support
     STATIC
     INTERNAL_MODULE
     DEFINES
@@ -20,15 +22,13 @@ qt_add_module(InputSupport
         Qt::GuiPrivate
     PRECOMPILED_HEADER
         "../../corelib/global/qt_pch.h"
+    NO_GENERATE_CPP_EXPORTS
 )
 
-#### Keys ignored in scope 2:.:.:input-support.pro:<TRUE>:
-# MODULE = "input_support"
-
 ## Scopes:
 #####################################################################
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev
+qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev
     SOURCES
         evdevkeyboard/qevdevkeyboard_defaultmap_p.h
         evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h
@@ -36,40 +36,41 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev
         evdevmouse/qevdevmousehandler.cpp evdevmouse/qevdevmousehandler_p.h
         evdevmouse/qevdevmousemanager.cpp evdevmouse/qevdevmousemanager_p.h
         evdevtouch/qevdevtouchhandler.cpp evdevtouch/qevdevtouchhandler_p.h
+        evdevtouch/qevdevtouchfilter_p.h
         evdevtouch/qevdevtouchmanager.cpp evdevtouch/qevdevtouchmanager_p.h
     INCLUDE_DIRECTORIES
         evdevtouch/../shared
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
+qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
     SOURCES
         evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h
         evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
+qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
     LIBRARIES
         PkgConfig::Libudev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
+qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
     LIBRARIES
         PkgConfig::Libudev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
+qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
     LIBRARIES
         PkgConfig::Mtdev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib
+qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_tslib
     SOURCES
         tslib/qtslib.cpp tslib/qtslib_p.h
     PUBLIC_LIBRARIES
         PkgConfig::Tslib
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
+qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_libinput
     SOURCES
         libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h
         libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h
@@ -82,14 +83,19 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
         PkgConfig::Libudev
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
+qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
+    LIBRARIES
+        XKB::XKB
+)
+
+qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
     SOURCES
         shared/devicehandlerlist_p.h
         shared/qevdevutil.cpp shared/qevdevutil_p.h
-        shared/qtouchoutputmapping.cpp shared/qtouchoutputmapping_p.h
+        shared/qoutputmapping.cpp shared/qoutputmapping_p.h
 )
 
-qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
+qt_internal_extend_target(InputSupportPrivate CONDITION QT_FEATURE_integrityhid
     SOURCES
         integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h
     LIBRARIES