janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 21:13:56 +01:00
Code Activity

make: Introduce QT_MAJOR_VERSION

Browse source 
- Replace QT_MAJOR_VERSION
  - Replace QT_VERSION by QT_MAJOR_VERSION
This commit is contained in:
Jan Lindemann 2007-06-17 11:51:29 +00:00 • committed by Jan Lindemann
commit 0f3d0ad40d
4 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
make/rules.mk
View file

@ -24,7 +24,7 @@ $(LIBDIR):
# $(AR) r $@ $*.o
# $(RM) $*.o
ifeq ($(QT_VERSION),3)
ifeq ($(QT_MAJOR_VERSION),3)
moc_%.cpp: %.h
$(MOC) -o $@ $<
else
@ -35,14 +35,14 @@ endif
rcc_%.cpp: %.qrc
$(RCC) -o $@ $<
ifeq ($(QT_VERSION),4)
ifeq ($(QT_MAJOR_VERSION),4)
ui_%.h: %.ui
else
%.h: %.ui
endif
$(UIC) $< -o $@
ifeq ($(QT_VERSION),4)
ifeq ($(QT_MAJOR_VERSION),4)
uic_%.cpp: %.h
echo -e "#include <$<>\n" > $@
else