From 2c21340c79717a429a2aeaf5797f9e612ddb2b9d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 1 Jun 2010 13:00:22 +0100 Subject: [PATCH] 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. --- configure.ac | 6 ++++++ tests/examples/overlay/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index caaa381..540a9d0f 100644 --- 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 68576a3..55dbb02 100644 --- 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) -- 2.7.4