diff --git a/make/qt-defs.mk b/make/qt-defs.mk index f30f1cfe..fa9c448b 100644 --- a/make/qt-defs.mk +++ b/make/qt-defs.mk @@ -47,9 +47,9 @@ RCCFILES += $(wildcard *.qrc) ifneq ($(wildcard *.h),) MOC_H_HC += $(shell grep -H Q_OBJECT $(wildcard *.h) | cut -d: -f1 | sort -u) endif -MOC_H_UI += $(patsubst %.ui,%.h,$(UIFILES)) +MOC_H_UI += $(patsubst %.ui,ui_%.h,$(UIFILES)) MOC_H += $(sort $(MOC_H_HC) $(MOC_H_UI)) -MOC_CPP += $(patsubst %.h,moc_%.cpp, $(MOC_H)) +MOC_CPP += $(patsubst %.ui,moc_%.cpp, $(UIFILES)) RCC_CPP += $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES)) ifeq ($(QT_MAJOR_VERSION),4) UIC_H += $(patsubst %.ui,ui_%.h, $(UIFILES))