vlc | branch: master | Pierre Lamot <[email protected]> | Tue Mar 10 09:35:08 2020 +0100| [46632a5464b7f8555de171146a7e09efd1e6fe5b] | committer: Steve Lhomme
contrib: qt: disable some features we don't need > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=46632a5464b7f8555de171146a7e09efd1e6fe5b --- contrib/src/qtdeclarative/rules.mak | 6 +++++- contrib/src/qtquickcontrols2/rules.mak | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak index 4a396ffe64..a14b06ad73 100644 --- a/contrib/src/qtdeclarative/rules.mak +++ b/contrib/src/qtdeclarative/rules.mak @@ -23,9 +23,13 @@ qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum $(UNPACK) $(MOVE) +QT_DECLARATIVE_CONFIG := \ + -no-feature-qml-debug \ + -no-feature-quick-designer + .qtdeclarative: qtdeclarative # Generate Makefile & src/Makefile - cd $< && $(PREFIX)/bin/qmake + cd $< && $(PREFIX)/bin/qmake -- $(QT_DECLARATIVE_CONFIG) cd $</src && $(PREFIX)/bin/qmake -o Makefile src.pro # Build & install only what we require # Invoke the build rules one at a time as some rule dependencies seem to be broken diff --git a/contrib/src/qtquickcontrols2/rules.mak b/contrib/src/qtquickcontrols2/rules.mak index db0695e43d..b50bba7822 100644 --- a/contrib/src/qtquickcontrols2/rules.mak +++ b/contrib/src/qtquickcontrols2/rules.mak @@ -24,8 +24,14 @@ qtquickcontrols2: qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz .sum-q $(UNPACK) $(MOVE) +QUICK_CONTROL_CONFIG := \ + -no-feature-quicktemplates2-multitouch \ + -no-feature-quickcontrols2-universal \ + -no-feature-quickcontrols2-material \ + -no-feature-quickcontrols2-imagine + .qtquickcontrols2: qtquickcontrols2 - cd $< && $(PREFIX)/bin/qmake + cd $< && $(PREFIX)/bin/qmake -- $(QUICK_CONTROL_CONFIG) # Make && Install libraries cd $< && $(MAKE) cd $< && $(MAKE) -C src sub-quickcontrols2-install_subtargets sub-imports-install_subtargets _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
