From 0ed6e0f167db04e1b5a9dce9903aa9718ca7ec65 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 2 May 2005 04:19:51 +0000 Subject: [PATCH] defs.mk: Uic works differently in qt4 --- make/defs.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/make/defs.mk b/make/defs.mk index 930afc59..3410cbc5 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -174,7 +174,11 @@ MOC_H_UI = $(patsubst %.ui,%.h,$(UIFILES)) MOC_H = $(sort $(MOC_H_HC) $(MOC_H_UI)) MOC_CPP = $(patsubst %.h,moc_%.cpp, $(MOC_H)) RCC_CPP = $(patsubst %.qrc,rcc_%.cpp, $(RCCFILES)) +ifeq ($(QT_VERSION),4) +UIC_H = $(patsubst %.ui,ui_%.h, $(UIFILES)) +else UIC_H = $(patsubst %.ui,%.h, $(UIFILES)) +endif UIC_CPP = $(patsubst %.ui,uic_%.cpp, $(UIFILES)) OBJ += $(patsubst %.cpp,%.o,$(MOC_CPP))