From b0f0b3a926d4cb1e8d65b1eca28f37acba9e6016 Mon Sep 17 00:00:00 2001 From: bernie Date: Mon, 25 Aug 2008 18:04:52 +0000 Subject: [PATCH] Kill MOC and use QT_MOC instead git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1694 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/config.mk | 1 - bertos/rules.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bertos/config.mk b/bertos/config.mk index a8581d4d..c6a42a6a 100644 --- a/bertos/config.mk +++ b/bertos/config.mk @@ -42,7 +42,6 @@ SHELL = /bin/sh CHECKER = sparse DOXYGEN = doxygen AVRDUDE = avrdude -MOC = moc-qt4 FLEXCAT = $(top_srcdir)/tools/flexcat/flexcat # For conversion from ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB. diff --git a/bertos/rules.mk b/bertos/rules.mk index f898fcd9..ff0357ee 100644 --- a/bertos/rules.mk +++ b/bertos/rules.mk @@ -276,7 +276,7 @@ $(foreach t,$(TRG),$(eval $(call build_target,$(t)))) # NOTE: moc totally sucks and can generate empty files for some error conditions, # leading to puzzling linker errors. Kill 'em and abort build. %_moc.cpp: %.h - $(MOC) -o $@ $< + $(QT_MOC) -o $@ $< if [ ! -s $< ]; then \ rm -f $@; \ exit 1; \ -- 2.25.1