Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
9f13848c
Commit
9f13848c
authored
May 30, 2006
by
zorglub
Browse files
QT4 detection patch by Pavlov Konstantin
parent
172b718f
Changes
3
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
9f13848c
...
...
@@ -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)
...
...
modules/gui/qt4/Modules.am
View file @
9f13848c
...
...
@@ -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_" $< >> $@
...
...
modules/gui/qt4/main_interface.cpp
View file @
9f13848c
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment