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
This commit is contained in:
Christian Prochaska 2019-01-11 16:34:33 +01:00 committed by Norman Feske
parent 745ee04583
commit 119a12cba5

View File

@ -44,8 +44,8 @@ SRC_CC += $(SOURCES_FILTERED)
# handle moc-headers, resources and ui descriptions # handle moc-headers, resources and ui descriptions
$(addsuffix .o,$(basename $(SRC_CC))): $(addprefix ui_,$(FORMS:.ui=.h)) $(addsuffix .o,$(basename $(SRC_CC))): $(addprefix ui_,$(FORMS:.ui=.h))
SRC_CC_QT_GENERATED = $(addprefix moc_,$(HEADERS_FILTERED:.h=.cpp)) \ SRC_CC_QT_GENERATED = $(join $(dir $(HEADERS_FILTERED)),$(addprefix moc_,$(notdir $(HEADERS_FILTERED:.h=.cpp)))) \
$(addprefix qrc_,$(RESOURCES:.qrc=.cpp)) $(join $(dir $(RESOURCES)),$(addprefix qrc_,$(notdir $(RESOURCES:.qrc=.cpp))))
.SECONDARY: $(SRC_CC_QT_GENERATED) .SECONDARY: $(SRC_CC_QT_GENERATED)
SRC_CC += $(SRC_CC_QT_GENERATED) SRC_CC += $(SRC_CC_QT_GENERATED)