[vlc-devel] [PATCH 3.0 32/41] contrib: qt: do not build tests

Steve Lhomme robux4 at ycbcr.xyz
Tue Jul 7 15:11:31 CEST 2020


+ cleaning

(cherry picked from commit 951339d2955fa4cddcb78ea677845a7d132fca1a) (edited)

edited:
- this branch doesn't use qt-zlib (yet)
- this branch doesn't use OpenGL

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
 contrib/src/qt/rules.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index f1f028bbce..2a1f919398 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -69,7 +69,7 @@ endif
 QT_CONFIG := -static -opensource -confirm-license -no-pkg-config \
 	-no-sql-sqlite -no-gif -qt-libjpeg -no-openssl $(QT_OPENGL) -no-dbus \
 	-no-vulkan -no-sql-odbc -no-pch \
-	-no-compile-examples -nomake examples
+	-no-compile-examples -nomake examples -nomake tests
 
 QT_CONFIG += -release
 
@@ -110,5 +110,5 @@ ifdef HAVE_WIN32
 	cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Widget/ -lqwindowsvistastyle -lQt5Widget/' Qt5Widgets.pc
 endif
 	# Install a qmake with correct paths set
-	cd $<; $(MAKE) sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
+	cd $< && $(MAKE) sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
 	touch $@
-- 
2.26.2



More information about the vlc-devel mailing list