QT: Fix bug in *.pro search which prevent QT_SUBDIRS to work for other than direct...

[omk.git] / snippets / qt.omk

diff --git a/snippets/qt.omk b/snippets/qt.omk
index 3bd33dc302bb88e856bd4b8344876857d42bcca6..35063bcb1e8f5e0c6e4c471c19e89aaf240e95ba 100644 (file)
--- a/snippets/qt.omk
+++ b/snippets/qt.omk
@@ -18,6 +18,7 @@ $(LOCAL_BUILD_DIR)/$(dir $(1))Makefile: $(SOURCES_DIR)/$(1)
             $(QTDIR:%=QTDIR=%) CC=$(CC) CXX=$(CXX)                     \
             LIBS+="-L$(USER_LIB_DIR)" DESTDIR=$(USER_BIN_DIR)          \
             INCLUDEPATH+="$(USER_INCLUDE_DIR)"                         \
+            DEPENDPATH+="$(USER_INCLUDE_DIR)"                          \
             QMAKE_LFLAGS="-Wl,-rpath-link,$(USER_LIB_DIR) $$(QMAKE_LFLAGS)" \
             $(SOURCES_DIR)/$(1)
 
@@ -43,6 +44,6 @@ clean-qt-$(dir $(1)): $(LOCAL_BUILD_DIR)/$(dir $(1))Makefile
 endef
 
 $(foreach pro,$(QT_PROJECTS), $(eval $(call qt_project_template,$(pro))))
-$(foreach pro,$(foreach dir,$(QT_SUBDIRS), $(wildcard $(dir)/*.pro)), $(eval $(call qt_project_template,$(pro))))
+$(foreach pro,$(foreach dir,$(QT_SUBDIRS), $(wildcard $(SOURCES_DIR)/$(dir)/*.pro)), $(eval $(call qt_project_template,$(pro:$(SOURCES_DIR)/%=%))))
 
 endif