From e9a58ba9e55467f8c69e19dd52c2afa7cbb39529 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 Nov 2019 15:00:38 +0100 Subject: Regenerate src/* Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- src/platformsupport/input/CMakeLists.txt | 22 +++++++++++----------- src/platformsupport/input/xkbcommon/CMakeLists.txt | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/platformsupport/input') diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index 3c5cbaa4ce..d9fa7f80fd 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -9,7 +9,7 @@ qt_find_package(Mtdev) # special case ## InputSupport Module: ##################################################################### -add_qt_module(InputSupport +qt_add_module(InputSupport STATIC INTERNAL_MODULE DEFINES @@ -33,7 +33,7 @@ add_qt_module(InputSupport ## Scopes: ##################################################################### -extend_target(InputSupport CONDITION QT_FEATURE_evdev +qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev SOURCES evdevkeyboard/qevdevkeyboard_defaultmap_p.h evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h @@ -46,35 +46,35 @@ extend_target(InputSupport CONDITION QT_FEATURE_evdev evdevtouch/../shared ) -extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent +qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent SOURCES evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h ) -extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent +qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent LIBRARIES PkgConfig::Libudev ) -extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev +qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev LIBRARIES PkgConfig::Libudev ) -extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev +qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev LIBRARIES PkgConfig::Mtdev ) -extend_target(InputSupport CONDITION QT_FEATURE_tslib +qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib SOURCES tslib/qtslib.cpp tslib/qtslib_p.h PUBLIC_LIBRARIES PkgConfig::Tslib ) -extend_target(InputSupport CONDITION QT_FEATURE_libinput +qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput SOURCES libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h @@ -87,7 +87,7 @@ extend_target(InputSupport CONDITION QT_FEATURE_libinput PkgConfig::Libudev ) -extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon +qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon LIBRARIES Qt::XkbCommonSupportPrivate XKB::XKB @@ -95,14 +95,14 @@ extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommo Qt::XkbCommonSupport ) -extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput +qt_extend_target(InputSupport 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 ) -extend_target(InputSupport CONDITION QT_FEATURE_integrityhid +qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid SOURCES integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h LIBRARIES diff --git a/src/platformsupport/input/xkbcommon/CMakeLists.txt b/src/platformsupport/input/xkbcommon/CMakeLists.txt index 74e43cd10e..18d07932d4 100644 --- a/src/platformsupport/input/xkbcommon/CMakeLists.txt +++ b/src/platformsupport/input/xkbcommon/CMakeLists.txt @@ -4,7 +4,7 @@ ## XkbCommonSupport Module: ##################################################################### -add_qt_module(XkbCommonSupport +qt_add_module(XkbCommonSupport STATIC INTERNAL_MODULE SOURCES @@ -29,7 +29,7 @@ add_qt_module(XkbCommonSupport ## Scopes: ##################################################################### -extend_target(XkbCommonSupport CONDITION CLANG AND NOT ICC +qt_extend_target(XkbCommonSupport CONDITION CLANG AND NOT ICC COMPILE_OPTIONS -ftemplate-depth=1024 ) -- cgit v1.2.3