contrib: qt: remove the previous contrib hacks

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

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 $@

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 $@

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 $@

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 $@