From 1c655fb0fc08e89ab5efb23889266b710334f1a5 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Wed, 20 Nov 2019 09:25:19 +0100 Subject: Post merge fixes Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581 Reviewed-by: Alexandru Croitor --- src/platformsupport/CMakeLists.txt | 5 +++++ src/platformsupport/input/.prev_CMakeLists.txt | 23 +++++++++++------------ src/platformsupport/input/CMakeLists.txt | 1 - src/platformsupport/linuxofono/CMakeLists.txt | 20 ++++++++++++++++++++ 4 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 src/platformsupport/linuxofono/CMakeLists.txt (limited to 'src/platformsupport') diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index 158ad419a3..fc980f3707 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -5,6 +5,11 @@ add_subdirectory(eventdispatchers) add_subdirectory(devicediscovery) add_subdirectory(fbconvenience) add_subdirectory(themes) +# special case begin +if (QT_FEATURE_dbus) + add_subdirectory(linuxofono) +endif() +# special case end if(APPLE OR QT_FEATURE_freetype OR WIN32) add_subdirectory(fontdatabases) endif() diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt index 1d5270f234..15ce6207f2 100644 --- a/src/platformsupport/input/.prev_CMakeLists.txt +++ b/src/platformsupport/input/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## InputSupport Module: ##################################################################### -add_qt_module(InputSupport +qt_add_module(InputSupport STATIC INTERNAL_MODULE DEFINES @@ -23,12 +23,11 @@ add_qt_module(InputSupport #### Keys ignored in scope 3:.:.:input-support.pro:: # MODULE = "input_support" -# _LOADED = "qt_module" ## 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 @@ -41,35 +40,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 @@ -82,7 +81,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 @@ -90,14 +89,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/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index d9fa7f80fd..d19363b6a3 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -28,7 +28,6 @@ qt_add_module(InputSupport #### Keys ignored in scope 3:.:.:input-support.pro:: # MODULE = "input_support" -# _LOADED = "qt_module" ## Scopes: ##################################################################### diff --git a/src/platformsupport/linuxofono/CMakeLists.txt b/src/platformsupport/linuxofono/CMakeLists.txt new file mode 100644 index 0000000000..ba8bc97dd6 --- /dev/null +++ b/src/platformsupport/linuxofono/CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from linuxofono.pro. + +##################################################################### +## LinuxOfonoSupport Module: +##################################################################### + +add_qt_module(LinuxOfonoSupport + STATIC + INTERNAL_MODULE + SOURCES + qofonoservice_linux.cpp qofonoservice_linux_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus +) + +#### Keys ignored in scope 1:.:.:linuxofono.pro:: +# MODULE = "linuxofono_support" -- cgit v1.2.3