vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Mon Oct 8 18:31:58 2018 +0200| [5d1720e568010bb4d790457fa2a5f2ecd026ff5e] | committer: Steve Lhomme
contribs: Qt: Always use the prefix-based qmake > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d1720e568010bb4d790457fa2a5f2ecd026ff5e --- contrib/src/qtdeclarative/rules.mak | 5 ----- contrib/src/qtgraphicaleffects/rules.mak | 4 ---- contrib/src/qtquickcontrols/rules.mak | 4 ---- contrib/src/qtquickcontrols2/rules.mak | 10 +--------- contrib/src/qtsvg/rules.mak | 4 ---- 5 files changed, 1 insertion(+), 26 deletions(-) diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak index b2a6d0a2e0..817ec82874 100644 --- a/contrib/src/qtdeclarative/rules.mak +++ b/contrib/src/qtdeclarative/rules.mak @@ -31,13 +31,8 @@ qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative .qtdeclarative: qtdeclarative # Generate Makefile & src/Makefile -ifdef HAVE_CROSS_COMPILE cd $< && $(PREFIX)/bin/qmake cd $</src && $(PREFIX)/bin/qmake -o Makefile src.pro -else - cd $< && ../qt/bin/qmake - cd $</src && ../../qt/bin/qmake -o Makefile src.pro -endif # Build & install only what we require # Invoke the build rules one at a time as some rule dependencies seem to be broken cd $< && $(MAKE) -C src sub-quick-make_first-ordered diff --git a/contrib/src/qtgraphicaleffects/rules.mak b/contrib/src/qtgraphicaleffects/rules.mak index 63a16e2dd4..669265fc9b 100644 --- a/contrib/src/qtgraphicaleffects/rules.mak +++ b/contrib/src/qtgraphicaleffects/rules.mak @@ -27,11 +27,7 @@ qtgraphicaleffects: qtgraphicaleffects-$(QTGE_VERSION).tar.xz .sum-qtgraphicalef $(MOVE) .qtgraphicaleffects: qtgraphicaleffects -ifdef HAVE_CROSS_COMPILE cd $< && $(PREFIX)/bin/qmake -else - cd $< && ../qt/bin/qmake -endif # Make && Install libraries cd $< && $(MAKE) cd $< && $(MAKE) -C src sub-effects-install_subtargets diff --git a/contrib/src/qtquickcontrols/rules.mak b/contrib/src/qtquickcontrols/rules.mak index 911011372b..c4bdb4d3fc 100644 --- a/contrib/src/qtquickcontrols/rules.mak +++ b/contrib/src/qtquickcontrols/rules.mak @@ -15,11 +15,7 @@ qtquickcontrols: qtquickcontrols-$(QTQC_VERSION).tar.xz .sum-qtquickcontrols $(MOVE) .qtquickcontrols: qtquickcontrols -ifdef HAVE_CROSS_COMPILE cd $< && $(PREFIX)/bin/qmake -else - cd $< && ../qt/bin/qmake -endif # Make && Install libraries cd $< && $(MAKE) cd $< && $(MAKE) -C src sub-controls-install_subtargets diff --git a/contrib/src/qtquickcontrols2/rules.mak b/contrib/src/qtquickcontrols2/rules.mak index cfd7bf0583..cff4aaf767 100644 --- a/contrib/src/qtquickcontrols2/rules.mak +++ b/contrib/src/qtquickcontrols2/rules.mak @@ -27,16 +27,8 @@ qtquickcontrols2: qtquickcontrols2-$(QTQC2_VERSION).tar.xz .sum-qtquickcontrols2 mv qtquickcontrols2-everywhere-src-$(QTQC2_VERSION) qtquickcontrols2-$(QTQC2_VERSION) $(MOVE) - -ifdef HAVE_CROSS_COMPILE -QMAKE=$(PREFIX)/bin/qmake -else -QMAKE=../qt/bin/qmake -endif - - .qtquickcontrols2: qtquickcontrols2 - cd $< && $(QMAKE) + cd $< && $(PREFIX)/bin/qmake # Make && Install libraries cd $< && $(MAKE) cd $< && $(MAKE) -C src sub-quickcontrols2-install_subtargets sub-imports-install_subtargets diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak index d82c727be0..9784b51ffd 100644 --- a/contrib/src/qtsvg/rules.mak +++ b/contrib/src/qtsvg/rules.mak @@ -25,11 +25,7 @@ qtsvg: qtsvg-$(QTSVG_VERSION).tar.xz .sum-qtsvg $(MOVE) .qtsvg: qtsvg -ifdef HAVE_CROSS_COMPILE cd $< && $(PREFIX)/bin/qmake -else - cd $< && ../qt/bin/qmake -endif # Make && Install libraries cd $< && $(MAKE) cd $< && $(MAKE) -C src sub-plugins-install_subtargets sub-svg-install_subtargets _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
