Kill MOC and use QT_MOC instead

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1694 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/config.mk b/bertos/config.mk
index a8581d4d45aaee03c414557c86ff8335904160f7..c6a42a6ad55e9b75f0cf59995e9f53a359bc7deb 100644 (file)
--- 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 f898fcd94940f32e55456cec3970acfc2861908b..ff0357eebba8e26f92d5377f492efcd3978c1eb0 100644 (file)
--- 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; \