Mercurial > hg > syntilista

changeset 292:47ecb4b14e3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show Qt version we are building for in QT tool names.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 09 May 2023 12:31:42 +0300
parents bc6767398eec
children c158ce77465c
files Makefile.gen
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.gen	Tue May 09 12:04:59 2023 +0300
+++ b/Makefile.gen	Tue May 09 12:31:42 2023 +0300
@@ -140,10 +140,10 @@
 	@$(call DO_CMD,CXX,$@,$(CXX) $(CXXFLAGS) -dM -E -o $@ $(OBJPATH)dummy.cpp)
 
 moc_%.cpp: %.h $(QT_MOC_RULES)
-	@$(call DO_CMD,Qt:MOC,$@ $<,$(QT_MOC) $(DEFINES) $(QT_MOC_FLAGS) $(INCPATH) $< -o $@)
+	@$(call DO_CMD,$(QT_VERSION_PREFIX):MOC,$@ $<,$(QT_MOC) $(DEFINES) $(QT_MOC_FLAGS) $(INCPATH) $< -o $@)
 
 ui_%.h: %.ui
-	@$(call DO_CMD,Qt:UIC,$@ $<,$(QT_UIC) $(QT_UIC_FLAGS) $< -o $@)
+	@$(call DO_CMD,$(QT_VERSION_PREFIX):UIC,$@ $<,$(QT_UIC) $(QT_UIC_FLAGS) $< -o $@)
 
 
 $(OBJPATH)%.o: src/%.cpp src/%.h
@@ -184,7 +184,7 @@
 	@$(call DO_CMD,CONVERT,$+ -> $@,convert $+ $@)
 
 src/%.cpp: src/%.qrc $(APP_RESOURCES)
-	@$(call DO_CMD,Qt:RCC,$@ $<,$(QT_RCC) -name "Syntilista" $< -o $@)
+	@$(call DO_CMD,$(QT_VERSION_PREFIX):RCC,$@ $<,$(QT_RCC) -name "Syntilista" $< -o $@)
 
 $(OBJPATH)main.o: src/main.cpp $(APP_HDRS) VERSION
 	$(call COMPILE_CXX_OBJ, $(DEFINES) $(INCPATH))