Commit 9f13848c authored by zorglub's avatar zorglub

QT4 detection patch by Pavlov Konstantin

parent 172b718f
......@@ -4615,7 +4615,8 @@ AC_ARG_ENABLE(qt4,
enableqt4=true
VLC_ADD_LDFLAGS([qt4],[$QT4_LIBS])
VLC_ADD_CXXFLAGS([qt4],[$QT4_CFLAGS])
MOC=moc],
MOC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/moc
UIC=`$PKG_CONFIG --variable=exec_prefix QtCore`/bin/uic],
[AC_MSG_WARN(QT4 library not found)])
fi])
AM_CONDITIONAL(ENABLE_QT4, test "$enableqt4" = "true")
......@@ -5435,6 +5436,7 @@ AC_SUBST(ARCH)
AC_SUBST(ALIASES)
AC_SUBST(ASM)
AC_SUBST(MOC)
AC_SUBST(UIC)
AC_SUBST(WINDRES)
AC_SUBST(MOZILLA_SDK_PATH)
AC_SUBST(XPIDL)
......
......@@ -22,8 +22,6 @@ TOMOC = main_interface \
util/input_slider
MOCCPP := $(TOMOC:%=%.moc.cpp)
UIC = uic
nodist_SOURCES_qt4 = \
main_interface.moc.cpp \
dialogs_provider.moc.cpp \
......@@ -39,12 +37,12 @@ endif
$(MOCCPP): %.moc.cpp: %.hpp
@echo "MOC $< -> $@"
@echo "$(MOC) $< -> $@"
$(MOC) -o $@ $<
$(UIH): %.h: %.ui
$(install_sh) -d ui
@echo "UIC $< -> $@"
@echo "$(UIC) $< -> $@"
rm -f $@
echo "#define Q_(a,b) _(a)" > $@
$(UIC) -tr "Q_" $< >> $@
......
......@@ -24,6 +24,7 @@
#include "input_manager.hpp"
#include "dialogs_provider.hpp"
#include <QCloseEvent>
#include <assert.h>
MainInterface::MainInterface( intf_thread_t *_p_intf ) :
QWidget( NULL ), p_intf( _p_intf)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment