[vlc-commits] contrib: qt: partially revert 4f72f199f20530803227ca09478d6004a0bb9703

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Mar 11 09:12:30 2020 +0100| [06237e184dfb0445dfd1a2b03f9b4c15e2e0be9f] | committer: Steve Lhomme

contrib: qt: partially revert 4f72f199f20530803227ca09478d6004a0bb9703

- Using the system zlib doesn't seem to work because of QtSvg
- QtDeclarative depends testlib which I don't know how to disable properly

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06237e184dfb0445dfd1a2b03f9b4c15e2e0be9f
---

 contrib/src/qt/rules.mak | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 65937d7bc1..fc9bb7b41a 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -82,10 +82,9 @@ endif
 QT_CONFIG := -static -no-shared -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 -nomake tests
+	-no-compile-examples -nomake examples -nomake tests -qt-zlib
 
 QT_CONFIG += -skip qtsql
-QT_CONFIG += -skip qttest
 QT_CONFIG += -release
 
 ifeq ($(V),1)
@@ -104,7 +103,7 @@ ENV_VARS := $(HOSTVARS) DXSDK_DIR=$(PREFIX)/bin
 	+cd $< && $(ENV_VARS) ./configure $(QT_PLATFORM) $(QT_CONFIG) -prefix $(PREFIX) -I $(PREFIX)/include
 	# Make && Install libraries
 	cd $< && $(ENV_VARS) $(MAKE)
-	cd $< && $(MAKE) -C src sub-corelib-install_subtargets sub-gui-install_subtargets sub-widgets-install_subtargets sub-platformsupport-install_subtargets sub-bootstrap-install_subtargets sub-network-install_subtargets
+	cd $< && $(MAKE) -C src sub-corelib-install_subtargets sub-gui-install_subtargets sub-widgets-install_subtargets sub-platformsupport-install_subtargets sub-zlib-install_subtargets sub-bootstrap-install_subtargets sub-network-install_subtargets sub-testlib-install_subtargets
 	# Install tools
 	cd $< && $(MAKE) -C src sub-moc-install_subtargets sub-rcc-install_subtargets sub-uic-install_subtargets sub-qlalr-install_subtargets
 	# Install plugins