tjh.dev
1diff --git a/kBuild/units/qt6.kmk b/kBuild/units/qt6.kmk
2index 28d61005..d65205cf 100644
3--- a/kBuild/units/qt6.kmk
4+++ b/kBuild/units/qt6.kmk
5@@ -1131,9 +1131,14 @@ else
6 ifeq ($(bld_trg),win)
7 $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT6_LIB)/$(qt_prefix)Qt6$(module)$(qt_infix)$(SUFF_LIB)) )
8 else
9- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT6_LIB)/lib$(qt_prefix)Qt6$(module)$(qt_infix)$(SUFF_DLL)) )
10+ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), \
11+ $(if $(filter Help,$(module)),$(PATH_QT6_TOOLS_LIB), \
12+ $(if $(filter StateMachine,$(module)),$(PATH_QT6_SCXML_LIB), \
13+ $(PATH_SDK_QT6_LIB)))/lib$(qt_prefix)Qt6$(module)$(qt_infix)$(SUFF_DLL)) \
14+ )
15 endif
16- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT6_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT6_INC) )
17+ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT6_INC)/Qt,$(qt_modules)) \
18+ $(PATH_SDK_QT6_INC) $(PATH_QT6_TOOLS_INC) $(PATH_QT6_SCXML_INC)/QtStateMachine )
19 endif
20 $(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) )
21
22@@ -1238,4 +1243,3 @@ unit-qt6-show-vars:
23 @$(ECHO) ' TOOL_QT6_RCC = "$(TOOL_QT6_RCC)"'
24 @$(ECHO) ' TOOL_QT6_LRC = "$(TOOL_QT6_LRC)"'
25 @$(ECHO) ' TOOL_QT6_LUPDATE = "$(TOOL_QT6_LUPDATE)"'
26-