From 8919e5e44ca7cc1727e1f515b96046c5cf0213aa Mon Sep 17 00:00:00 2001 From: Andreas Reischuck Date: Sun, 21 Apr 2024 01:04:04 +0200 Subject: [PATCH] Atempt to fix designerr CMake build (2) --- src/plugins/qmldesigner/CMakeLists.txt | 5 +++++ src/plugins/qmldesigner/qmldesignerplugin.qbs | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index b5b64bebbc8e..c52748edf038 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -51,6 +51,11 @@ extend_qtc_library(QmlDesignerUtils PROPERTIES COMPILE_WARNING_AS_ERROR ON ) +# remove interface compile definition (add_qtc_library seems wrong) +get_target_property(defs QmlDesignerUtils INTERFACE_COMPILE_DEFINITIONS) +list(FILTER defs EXCLUDE REGEX [[^QMLDESIGNERUTILS_LIBRARY$]]) +set_property(TARGET QmlDesignerUtils PROPERTY INTERFACE_COMPILE_DEFINITIONS ${defs}) + add_qtc_library(QmlDesignerCore STATIC CONDITION TARGET QmlDesignerBase AND TARGET Qt6::QmlPrivate AND TARGET Qt6::QmlDomPrivate AND TARGET Qt6::QmlCompilerPrivate EXCLUDE_FROM_INSTALL diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs index 871938556198..5c367626090b 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.qbs +++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs @@ -42,7 +42,6 @@ QtcPlugin { "QMLDESIGNERUTILS_LIBRARY", "QMLDESIGNER_LIBRARY", "QMLDESIGNERCORE_LIBRARY", - "QMLDESIGNERUTILS_LIBRARY", "QMLDESIGNERCOMPONENTS_LIBRARY", ]) cpp.enableExceptions: true