[vlc-commits] contrib: qtquickcontrols2: fix compilation in msys

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Mar 19 15:17:57 2020 +0100| [1ac8082a5f9c53e362c935ec9224e408070b857c] | committer: Steve Lhomme

contrib: qtquickcontrols2: fix compilation in msys

gcc is stupid and doesn't use the folder relative to the file that loads the
include.

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

 contrib/src/qtquickcontrols2/rules.mak | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/contrib/src/qtquickcontrols2/rules.mak b/contrib/src/qtquickcontrols2/rules.mak
index fa0999e530..7903a19a5a 100644
--- a/contrib/src/qtquickcontrols2/rules.mak
+++ b/contrib/src/qtquickcontrols2/rules.mak
@@ -33,6 +33,11 @@ QUICK_CONTROL_CONFIG := \
 .qtquickcontrols2: qtquickcontrols2
 	cd $< && $(PREFIX)/bin/qmake -- $(QUICK_CONTROL_CONFIG)
 	# Make && Install libraries
+	cd $< && $(MAKE) sub-src-qmake_all
+ifndef HAVE_CROSS_COMPILE
+	cd $<; for i in QtQuickControls2 QtQuickTemplates2; do \
+		sed -i -e 's,"../../../../../src,"../src,g' include/$$i/$(QTQC2_VERSION)/$$i/private/*.h; done
+endif
 	cd $< && $(MAKE) install_subtargets
 	$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5QuickControls2 qml/QtQuick/Controls.2 qtquickcontrols2plugin
 	$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5QuickControls2 qml/QtQuick/Templates.2 qtquicktemplates2plugin