[vlc-commits] contrib:qtquickcontrols2: use the defined QMAKE path
Steve Lhomme
git at videolan.org
Mon Oct 1 17:29:09 CEST 2018
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Oct 1 13:04:50 2018 +0200| [83ec5526d4892b559012b31fdc4b2e90eb580121] | committer: Steve Lhomme
contrib:qtquickcontrols2: use the defined QMAKE path
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=83ec5526d4892b559012b31fdc4b2e90eb580121
---
contrib/src/qtquickcontrols2/rules.mak | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/contrib/src/qtquickcontrols2/rules.mak b/contrib/src/qtquickcontrols2/rules.mak
index e61b125f57..cfd7bf0583 100644
--- a/contrib/src/qtquickcontrols2/rules.mak
+++ b/contrib/src/qtquickcontrols2/rules.mak
@@ -36,11 +36,7 @@ endif
.qtquickcontrols2: qtquickcontrols2
-ifdef HAVE_CROSS_COMPILE
- cd $< && $(PREFIX)/bin/qmake
-else
- cd $< && ../qt/bin/qmake
-endif
+ cd $< && $(QMAKE)
# Make && Install libraries
cd $< && $(MAKE)
cd $< && $(MAKE) -C src sub-quickcontrols2-install_subtargets sub-imports-install_subtargets
More information about the vlc-commits
mailing list