From 119a12cba50f50e372ee0e1bd3242de2e7e2c1ce Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Fri, 11 Jan 2019 16:34:33 +0100 Subject: [PATCH] qt5: support relative paths in qmake project files Support paths like '../util.h' or 'resources/panel.qrc' in the HEADERS and RESOURCES variables in qmake project files. Fixes #3115 --- repos/libports/lib/import/import-qt5.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/libports/lib/import/import-qt5.inc b/repos/libports/lib/import/import-qt5.inc index c57addfed..a54259c84 100644 --- a/repos/libports/lib/import/import-qt5.inc +++ b/repos/libports/lib/import/import-qt5.inc @@ -44,8 +44,8 @@ SRC_CC += $(SOURCES_FILTERED) # handle moc-headers, resources and ui descriptions $(addsuffix .o,$(basename $(SRC_CC))): $(addprefix ui_,$(FORMS:.ui=.h)) -SRC_CC_QT_GENERATED = $(addprefix moc_,$(HEADERS_FILTERED:.h=.cpp)) \ - $(addprefix qrc_,$(RESOURCES:.qrc=.cpp)) +SRC_CC_QT_GENERATED = $(join $(dir $(HEADERS_FILTERED)),$(addprefix moc_,$(notdir $(HEADERS_FILTERED:.h=.cpp)))) \ + $(join $(dir $(RESOURCES)),$(addprefix qrc_,$(notdir $(RESOURCES:.qrc=.cpp)))) .SECONDARY: $(SRC_CC_QT_GENERATED) SRC_CC += $(SRC_CC_QT_GENERATED)