Skip to content

Commit

Permalink
Merge pull request #2 from funman/master
Browse files Browse the repository at this point in the history 
Qt4 fixes
  • Loading branch information
Christophe Massiot committed Oct 6, 2014
2 parents 64c8b1d + 022c1c9 commit 6dddda3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions lib/upipe-qt/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
Expand Down

0 comments on commit 6dddda3

Please sign in to comment.