diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak index 0b7082d024aac10366ec76f2d0cb8f3790334f31..1653ed62c9fad1cac856fbbab6ff862c7387f15e 100644 --- a/contrib/src/qt/rules.mak +++ b/contrib/src/qt/rules.mak @@ -138,17 +138,13 @@ QT_QINSTALL="$(shell cd $(SRC)/qt/; pwd -P)/install_wrapper.sh" sub-imageformats-install_subtargets \ sub-platforms-install_subtargets \ sub-styles-install_subtargets - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Gui plugins/imageformats qjpeg + ifdef HAVE_WIN32 # Add the private include to our project (similar to using "gui-private" in a qmake project) as well as ANGLE headers sed -i.orig -e 's#-I$${includedir}/QtGui#-I$${includedir}/QtGui -I$${includedir}/QtGui/$(QT_VERSION)/QtGui -I$${includedir}/QtANGLE#' $(PREFIX)/lib/pkgconfig/Qt5Gui.pc - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Gui plugins/platforms qwindows - # Vista styling - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Widgets plugins/styles qwindowsvistastyle endif ifdef HAVE_MACOSX - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Gui plugins/platforms qcocoa # Qt Cocoa plugins depend on printer support... cd $< && cp ./lib/libQt5PrintSupport.a "$(PREFIX)/lib/" endif diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak index 00610bd91d702ea846760eb6b6b3652eb0a136e0..3862a6f8d7bfaea6ccab7fdab030f0cd47ccb60d 100644 --- a/contrib/src/qtdeclarative/rules.mak +++ b/contrib/src/qtdeclarative/rules.mak @@ -59,11 +59,4 @@ QT_DECLARATIVE_CONFIG := \ cd $< && $(MAKE) -C tools \ INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" \ sub-qmlcachegen-install_subtargets - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Quick qml/QtQuick.2 qtquick2plugin - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Quick qml/QtQuick/Layouts qquicklayoutsplugin - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Quick qml/QtQuick/Window.2 windowplugin - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Quick qml/QtQuick/Shapes qmlshapesplugin - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Qml qml/QtQml qmlplugin - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Qml qml/QtQml/Models.2 modelsplugin - touch $@ diff --git a/contrib/src/qtgraphicaleffects/rules.mak b/contrib/src/qtgraphicaleffects/rules.mak index 020b045d1f3a203f5bcd713024cf5ab037f81139..4f47237b2bf23be7d07cad0925fd26d28ed10ba0 100644 --- a/contrib/src/qtgraphicaleffects/rules.mak +++ b/contrib/src/qtgraphicaleffects/rules.mak @@ -25,11 +25,5 @@ qtgraphicaleffects: qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz .su .qtgraphicaleffects: qtgraphicaleffects cd $< && $(PREFIX)/lib/qt5/bin/qmake - # Make && Install libraries - cd $< && $(MAKE) - cd $< && $(MAKE) -C src \ - INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" \ - sub-effects-install_subtargets - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5QuickWidgets qml/QtGraphicalEffects qtgraphicaleffectsplugin - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5QuickWidgets qml/QtGraphicalEffects/private qtgraphicaleffectsprivate + cd $< && $(MAKE) install INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" touch $@ diff --git a/contrib/src/qtquickcontrols2/rules.mak b/contrib/src/qtquickcontrols2/rules.mak index 1220852b3368935e72192acd36b68558f5e0b399..5ee371e4907092587b8210b5edc1987a7f035387 100644 --- a/contrib/src/qtquickcontrols2/rules.mak +++ b/contrib/src/qtquickcontrols2/rules.mak @@ -40,6 +40,4 @@ ifndef HAVE_CROSS_COMPILE endif cd $< && $(MAKE) install_subtargets \ INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5QuickControls2 qml/QtQuick/Controls.2 qtquickcontrols2plugin - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5QuickControls2 qml/QtQuick/Templates.2 qtquicktemplates2plugin touch $@ diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak index 2cbcdf6ef77b1c4c0e66a90272aced133f81efb8..c4e8c191f5dda8709eb2d33f4a7d48d12f08d0e7 100644 --- a/contrib/src/qtsvg/rules.mak +++ b/contrib/src/qtsvg/rules.mak @@ -31,6 +31,4 @@ qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz .sum-qtsvg cd $< && $(MAKE) -C src sub-plugins-install_subtargets \ INSTALL_FILE="$(QT_QINSTALL)" VLC_PREFIX="$(PREFIX)" \ sub-svg-install_subtargets - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Svg plugins/iconengines qsvgicon - $(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Svg plugins/imageformats qsvg touch $@