[vlc-commits] contrib: qt: Simplify & always install mkspecs

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Nov 21 17:49:58 2018 +0100| [547af48003c5d80ea8aaecf3ceed83967ba10bd2] | committer: Hugo Beauzée-Luyssen

contrib: qt: Simplify & always install mkspecs

The tools are already built, so no need to fiddle with Qt's internals to
rebuild it. Doing so tend to cause problems when building upon
subsequent builds.
We need to install mkspecs so that qmake knows where to find the modules
we build in other Qt related contribs

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=547af48003c5d80ea8aaecf3ceed83967ba10bd2
---

 contrib/src/qt/rules.mak | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 2f3e33022e..b453b3fcf8 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -95,14 +95,6 @@ ifdef HAVE_WIN32
 	# Fix Qt5Widget.pc file to include qwindowsvistastyle before Qt5Widget, as it depends on it
 	cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Widget/ -lqwindowsvistastyle -lQt5Widget/' Qt5Widgets.pc
 endif
-ifdef HAVE_CROSS_COMPILE
-	# Building Qt build tools for Xcompilation
-	cd $</include/QtCore; $(LN_S)f $(QT_VERSION)/QtCore/private private
-	cd $<; $(MAKE) -C qmake
+	# Install a qmake with correct paths set
 	cd $<; $(MAKE) sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs
-	cd $</src/tools; \
-	for i in bootstrap uic rcc moc; \
-		do (cd $$i; echo $$i && ../../../bin/qmake -spec $(QT_SPEC) QMAKE_RC=$(HOST)-windres && $(MAKE) clean && $(MAKE) CC=$(HOST)-gcc CXX=$(HOST)-g++ LINKER=$(HOST)-g++ LIB="$(HOST)-ar -rc" && $(MAKE) install); \
-	done
-endif
 	touch $@