[vlc-commits] contrib: qt: fix pathes of private header on Msys2

Steve Lhomme git at videolan.org
Tue Nov 27 13:52:40 CET 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Nov 27 12:05:18 2018 +0100| [4ef68a82ff72870293bb97437f3d5a47f099212c] | committer: Steve Lhomme

contrib: qt: fix pathes of private header on Msys2

For some reason gcc can't use the "" pathes relative to the headers they are
defined in. It may be because pathes are too long.

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

 contrib/src/qt/rules.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index b453b3fcf8..1436f2cece 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -33,6 +33,10 @@ ifdef HAVE_WIN32
 ifndef HAVE_WIN64
 	$(APPLY) $(SRC)/qt/0001-disable-qt_random_cpu.patch
 endif
+ifndef HAVE_CROSS_COMPILE
+	cd qt-$(QT_VERSION_FULL); for i in QtFontDatabaseSupport QtWindowsUIAutomationSupport QtEventDispatcherSupport QtCore; do \
+		sed -i -e 's,"../../../../../src,"../src,g' include/$$i/$(QT_VERSION)/$$i/private/*.h; done
+endif
 endif
 	$(MOVE)
 



More information about the vlc-commits mailing list