From ac38fa11823f4cf020a9481c9de3d61caa8fccdc Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 3 Feb 2020 19:44:27 +0100 Subject: Regenerate projects to correctly handle private dependencies Change-Id: I7d84bc9962bff5c89a90367ae704974c6ce2ec89 Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert Reviewed-by: Alexandru Croitor --- src/platformsupport/input/.prev_CMakeLists.txt | 9 ++------- src/platformsupport/input/CMakeLists.txt | 9 ++------- src/platformsupport/input/xkbcommon/CMakeLists.txt | 5 +---- 3 files changed, 5 insertions(+), 18 deletions(-) (limited to 'src/platformsupport/input') diff --git a/src/platformsupport/input/.prev_CMakeLists.txt b/src/platformsupport/input/.prev_CMakeLists.txt index 15ce6207f2..f8c05e9f97 100644 --- a/src/platformsupport/input/.prev_CMakeLists.txt +++ b/src/platformsupport/input/.prev_CMakeLists.txt @@ -9,14 +9,10 @@ qt_add_module(InputSupport INTERNAL_MODULE DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::DeviceDiscoverySupport - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) @@ -83,10 +79,9 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon LIBRARIES - Qt::XkbCommonSupportPrivate XKB::XKB PUBLIC_LIBRARIES - Qt::XkbCommonSupport + Qt::XkbCommonSupportPrivate ) qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput diff --git a/src/platformsupport/input/CMakeLists.txt b/src/platformsupport/input/CMakeLists.txt index d19363b6a3..7ab93df062 100644 --- a/src/platformsupport/input/CMakeLists.txt +++ b/src/platformsupport/input/CMakeLists.txt @@ -14,14 +14,10 @@ qt_add_module(InputSupport INTERNAL_MODULE DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::DeviceDiscoverySupport - Qt::Gui PRECOMPILED_HEADER "../../corelib/global/qt_pch.h" ) @@ -88,10 +84,9 @@ qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon LIBRARIES - Qt::XkbCommonSupportPrivate XKB::XKB PUBLIC_LIBRARIES - Qt::XkbCommonSupport + Qt::XkbCommonSupportPrivate ) qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput diff --git a/src/platformsupport/input/xkbcommon/CMakeLists.txt b/src/platformsupport/input/xkbcommon/CMakeLists.txt index 18d07932d4..86d132d912 100644 --- a/src/platformsupport/input/xkbcommon/CMakeLists.txt +++ b/src/platformsupport/input/xkbcommon/CMakeLists.txt @@ -12,12 +12,9 @@ qt_add_module(XkbCommonSupport qxkbcommon_3rdparty.cpp DEFINES QT_NO_CAST_FROM_ASCII - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::Core - Qt::Gui XKB::XKB PRECOMPILED_HEADER "../../../corelib/global/qt_pch.h" -- cgit v1.2.3