From 2e8be78f3d2eed2fd3543d68e36f7abe68797251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Mon, 6 Oct 2014 11:34:38 +0200 Subject: [PATCH 1/2] upipe-qt: clean generated file --- lib/upipe-qt/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/upipe-qt/Makefile.am b/lib/upipe-qt/Makefile.am index 2a5cf095d..9651ef45b 100644 --- a/lib/upipe-qt/Makefile.am +++ b/lib/upipe-qt/Makefile.am @@ -2,6 +2,8 @@ if HAVE_QTWEBKIT lib_LTLIBRARIES = libupipe_qt.la endif +BUILT_SOURCES = moc_thumbnail.cpp +CLEANFILES = moc_thumbnail.cpp moc_thumbnail.cpp: thumbnail.h $(MOC) -DQT_NO_DEBUG -DQT_WEBKIT_LIB -DQT_GUI_LIB -DQT_CORE_LIB $(QTWEBKIT_CFLAGS) -I. $< -o $@ From 022c1c9a1e8f01eeb9c521c51ff707f48b3aa0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Mon, 6 Oct 2014 11:34:48 +0200 Subject: [PATCH 2/2] Fix moc-qt4 detection when both qt5 and qt4 are installed --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f5e633ae8..cec8c949e 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ PKG_PROG_PKG_CONFIG # Checks for programs. AC_CHECK_PROG(PERL, perl, perl) -AC_CHECK_PROG(MOC, moc, moc) +AC_PATH_PROG(MOC, [moc-qt4 moc], moc) AC_PROG_CXX AC_PROG_AWK AC_PROG_CC_C99