[vlc-devel] [PATCH 3.0 18/41] contribs: Qt: Always use the prefix-based qmake

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


From: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

(cherry picked from commit 5d1720e568010bb4d790457fa2a5f2ecd026ff5e) (edited)

edited:
- this branch doesn't have qtdeclarative, qtquickcontrols and qtquickcontrols2

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

diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
index 4076a646ef..8e4381b086 100644
--- a/contrib/src/qtsvg/rules.mak
+++ b/contrib/src/qtsvg/rules.mak
@@ -25,11 +25,7 @@ qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg
 	$(MOVE)
 
 .qtsvg: qtsvg
-ifdef HAVE_CROSS_COMPILE
 	cd $< && $(PREFIX)/bin/qmake
-else
-	cd $< && ../qt/bin/qmake
-endif
 	# Make && Install libraries
 	cd $< && $(MAKE)
 	cd $< && $(MAKE) -C src sub-plugins-install_subtargets sub-svg-install_subtargets
-- 
2.26.2



More information about the vlc-devel mailing list