[vlc-devel] [PATCH 3.0 14/41] contrib: qt: fix empty platform when not cross compiling

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


From: Thomas Guillem <thomas at gllm.fr>

(cherry picked from commit 8c381d410d48e6df8bc49a1bf0574594371cd82f) (rebased)

rebased:
- the order of parmaters was different in this branch

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

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 77f3ddfb9b..2fde11bb75 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -37,7 +37,7 @@ endif
 QT_OPENGL := -no-opengl
 
 ifdef HAVE_MACOSX
-QT_PLATFORM := -platform darwin-g++
+QT_SPEC := darwin-g++
 endif
 ifdef HAVE_WIN32
 ifdef HAVE_CLANG
@@ -48,9 +48,11 @@ endif
 ifdef HAVE_CROSS_COMPILE
 QT_PLATFORM := -xplatform $(QT_SPEC) -device-option CROSS_COMPILE=$(HOST)-
 else
+ifneq ($(QT_SPEC),)
 QT_PLATFORM := -platform $(QT_SPEC)
 endif
 endif
+endif
 
 QT_CONFIG := -static -opensource -confirm-license -no-pkg-config \
 	-no-sql-sqlite -no-gif -qt-libjpeg -no-openssl $(QT_OPENGL) -no-dbus \
-- 
2.26.2



More information about the vlc-devel mailing list