examples: get the right Qt moc binary to use via pkg-config

Should make us do the right thing in cases where both Qt3 and Qt4
are installed.

Fixes #620211.

diff --git a/configure.ac b/configure.ac
index caaa38190ef94ac02e4ed64beffe2beb91c5ba06..540a9d0ff8cb859bd98449ce6aa168811ef02290 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -291,6 +291,12 @@ PKG_CHECK_MODULES(QT, QtGui >= 4.6, [
   HAVE_QT_GV=no
   PKG_CHECK_MODULES(QT, QtGui >= 4.0, HAVE_QT=yes, HAVE_QT=no)
 ])
+if test "x$HAVE_QT" = "xyes"; then
+  AC_MSG_CHECKING([Qt moc])
+  QT4_MOC=`$PKG_CONFIG --variable=moc_location QtGui`
+  AC_MSG_RESULT($QT4_MOC)
+  AC_SUBST(QT4_MOC)
+fi
 AM_CONDITIONAL(HAVE_QT, test "x$HAVE_QT" = "xyes")
 AM_CONDITIONAL(HAVE_QT_GV, test "x$HAVE_QT_GV" = "xyes")
 

diff --git a/tests/examples/overlay/Makefile.am b/tests/examples/overlay/Makefile.am
index 68576a30c169cb856735f15af04eca323cf5cd9a..55dbb024ef252bad34f07bfed9432a5bf2f4482c 100644 (file)
--- a/tests/examples/overlay/Makefile.am
+++ b/tests/examples/overlay/Makefile.am
@@ -34,7 +34,7 @@ qtgv_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) \
 nodist_qtgv_xoverlay_SOURCES = moc_qtgv-xoverlay.cpp
 
 moc_%.cpp:%.h
-       $(AM_V_GEN)moc $< -o $@
+       $(AM_V_GEN)$(QT4_MOC) $< -o $@
 
 EXTRA_DIST = $(nodist_qtgv_xoverlay_SOURCES:moc_%.cpp=%.h)
 CLEANFILES = $(nodist_qtgv_xoverlay_SOURCES)