Commit 547af480 authored by Hugo Beauzée-Luyssen's avatar 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
parent 13ac11cd
......@@ -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
# 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); \
touch $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment