vlc | branch: master | Hugo Beauzée-Luyssen <h...@beauzee.fr> | Sat Aug 25 12:22:58 2018 +0200| [284c6a88486722b0b2f3a2ac872a121662ccb8f4] | committer: Hugo Beauzée-Luyssen
contribs: Fix qtquickcontrol/quickcontrols2 rules > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=284c6a88486722b0b2f3a2ac872a121662ccb8f4 --- contrib/src/{qtquickcontrols => qtquickcontrols2}/SHA512SUMS | 0 contrib/src/{qtquickcontrols => qtquickcontrols2}/rules.mak | 10 ++++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/contrib/src/qtquickcontrols/SHA512SUMS b/contrib/src/qtquickcontrols2/SHA512SUMS similarity index 100% rename from contrib/src/qtquickcontrols/SHA512SUMS rename to contrib/src/qtquickcontrols2/SHA512SUMS diff --git a/contrib/src/qtquickcontrols/rules.mak b/contrib/src/qtquickcontrols2/rules.mak similarity index 87% rename from contrib/src/qtquickcontrols/rules.mak rename to contrib/src/qtquickcontrols2/rules.mak index c0beeca280..d37c94cb7b 100644 --- a/contrib/src/qtquickcontrols/rules.mak +++ b/contrib/src/qtquickcontrols2/rules.mak @@ -5,7 +5,7 @@ QTQC_URL := http://download.qt.io/official_releases/qt/5.11/$(QTQC_VERSION)/subm QTQC2_URL := http://download.qt.io/official_releases/qt/5.11/$(QTQC_VERSION)/submodules/qtquickcontrols2-everywhere-src-$(QTQC_VERSION).tar.xz ifdef HAVE_WIN32 -PKGS += qtquickcontrols qtquickcontrols2 +PKGS += qtquickcontrols2 endif ifeq ($(call need_pkg,"Qt5QuickControls2"),) @@ -13,8 +13,7 @@ PKGS_FOUND += qtquickcontrols2 endif # QtQuickControl(1) doesn't provide a .pc -DEPS_qtquickcontrols = qtdeclarative $(DEPS_qtdeclarative) -DEPS_qtquickcontrols2 = qtquickcontrols $(DEPS_qtquickcontrols) +DEPS_qtquickcontrols2 = qtdeclarative $(DEPS_qtdeclarative) $(TARBALLS)/qtquickcontrols-$(QTQC_VERSION).tar.xz: $(call download,$(QTQC_URL)) @@ -22,10 +21,9 @@ $(TARBALLS)/qtquickcontrols-$(QTQC_VERSION).tar.xz: $(TARBALLS)/qtquickcontrols2-$(QTQC_VERSION).tar.xz: $(call download,$(QTQC2_URL)) -.sum-qtquickcontrols: qtquickcontrols-$(QTQC_VERSION).tar.xz -.sum-qtquickcontrols2: qtquickcontrols2-$(QTQC_VERSION).tar.xz +.sum-qtquickcontrols2: qtquickcontrols-$(QTQC_VERSION).tar.xz qtquickcontrols2-$(QTQC_VERSION).tar.xz -qtquickcontrols: qtquickcontrols-$(QTQC_VERSION).tar.xz .sum-qtquickcontrols +qtquickcontrols: qtquickcontrols-$(QTQC_VERSION).tar.xz .sum-qtquickcontrols2 $(UNPACK) mv qtquickcontrols-everywhere-src-$(QTQC_VERSION) qtquickcontrols-$(QTQC_VERSION) $(MOVE) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits