[vlc-devel] [PATCH 3.0 25/41] contrib: Qt: check for 5.11+ after ae422ac67e1714169823fa819cf1681ea466d625

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


From: Sean McGovern <gseanmcg at gmail.com>

Signed-off-by: RĂ©mi Denis-Courmont <remi at remlab.net>
(cherry picked from commit 33e652c65cfc0238bc012cf128e0f5275925d6a6) (rebased)

rebased:
- some conditional parts for ANGLE are not found in this branch

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

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 83f80487f8..da690d3275 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -13,7 +13,7 @@ ifdef HAVE_WIN32
 PKGS += qt
 endif
 
-ifeq ($(call need_pkg,"Qt5Core Qt5Gui Qt5Widgets"),)
+ifeq ($(call need_pkg,"Qt5Core >= 5.11 Qt5Gui Qt5Widgets"),)
 PKGS_FOUND += qt
 endif
 
-- 
2.26.2



More information about the vlc-devel mailing list