From 403213240c7b2dc09378e1cb8c147131e368f90c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 22 Sep 2020 10:16:58 +0200 Subject: CMake: Regenerate projects to use new qt_internal_ API Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- src/tools/qdbuscpp2xml/.prev_CMakeLists.txt | 6 +++--- src/tools/qdbuscpp2xml/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/tools/qdbuscpp2xml') diff --git a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt index fa02b5753c..2b1def9f56 100644 --- a/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/.prev_CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qdbuscpp2xml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler" SOURCES ../moc/cbordevice.h @@ -36,12 +36,12 @@ qt_add_tool(${target_name} ## Scopes: ##################################################################### -qt_extend_target(${target_name} CONDITION force_bootstrap +qt_internal_extend_target(${target_name} CONDITION force_bootstrap PUBLIC_LIBRARIES bootstrap_dbusPrivate ) -qt_extend_target(${target_name} CONDITION NOT force_bootstrap +qt_internal_extend_target(${target_name} CONDITION NOT force_bootstrap PUBLIC_LIBRARIES Qt::DBusPrivate ) diff --git a/src/tools/qdbuscpp2xml/CMakeLists.txt b/src/tools/qdbuscpp2xml/CMakeLists.txt index e831d5f392..865995755b 100644 --- a/src/tools/qdbuscpp2xml/CMakeLists.txt +++ b/src/tools/qdbuscpp2xml/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_get_tool_target_name(target_name qdbuscpp2xml) -qt_add_tool(${target_name} +qt_internal_add_tool(${target_name} TARGET_DESCRIPTION "Qt D-Bus C++ to XML Compiler" TOOLS_TARGET DBus # special case SOURCES @@ -44,6 +44,6 @@ qt_add_tool(${target_name} ##################################################################### # special case begin -# extend_target(qdbuscpp2xml CONDITION force_bootstrap [...]) -# extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...]) +# qt_internal_extend_target(qdbuscpp2xml CONDITION force_bootstrap [...]) +# qt_internal_extend_target(qdbuscpp2xml CONDITION NOT force_bootstrap [...]) # special case end -- cgit v1.2.3