Skip to content

Commit f3d8176

Browse files
committed
Contribs: use standard installations for Qt
Signed-off-by: Jean-Baptiste Kempf <[email protected]>
1 parent 3bfe126 commit f3d8176

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

contrib/src/qt/rules.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ QT_CONFIG := -static -release -opensource -confirm-license -no-pkg-config \
4848
cd $</src/plugins && $(MAKE) sub-platforms-install_subtargets
4949
mv $(PREFIX)/plugins/platforms/libqwindows.a $(PREFIX)/lib/ && rm -rf $(PREFIX)/plugins
5050
# Move includes to match what VLC expects
51-
rm -rf $(PREFIX)/include/qt5/ && mkdir $(PREFIX)/include/qt5/ && mv -v $(PREFIX)/include/Q* $(PREFIX)/include/qt5/
52-
mkdir $(PREFIX)/include/qt5/QtGui/qpa && cp $(PREFIX)/include/qt5/QtGui/$(QT_VERSION)/QtGui/qpa/qplatformnativeinterface.h $(PREFIX)/include/qt5/QtGui/qpa
51+
mkdir -p $(PREFIX)/include/QtGui/qpa
52+
cp $(PREFIX)/include/QtGui/$(QT_VERSION)/QtGui/qpa/qplatformnativeinterface.h $(PREFIX)/include/QtGui/qpa
5353
# Clean Qt mess
5454
rm -rf $(PREFIX)/lib/libQt5Bootstrap* $(PREFIX)/lib/*.prl $(PREFIX)/mkspecs
5555
ifdef HAVE_CROSS_COMPILE

0 commit comments

Comments
 (0)