[vlc-commits] [Git][videolan/vlc][master] contrib: qt: add qmake6 to the meson tools

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
dfc2363e by Steve Lhomme at 2024-11-15T09:23:08+00:00
contrib: qt: add qmake6 to the meson tools

This is necessary to use the Qt from contribs on Windows.

- - - - -


1 changed file:

- contrib/src/qt/rules.mak


Changes:

=====================================
contrib/src/qt/rules.mak
=====================================
@@ -29,6 +29,10 @@ ifndef HAVE_CROSS_COMPILE
 PKGS_FOUND += qt-tools
 else ifdef QT_USES_SYSTEM_TOOLS
 PKGS_FOUND += qt-tools
+else
+PKGS.tools += qt-tools
+PKGS.tools.qt-tools.config-tool = qmake6
+PKGS.tools.qt-tools.path = $(PREFIX)/bin/qmake6
 endif
 
 $(TARBALLS)/qtbase-everywhere-src-$(QTBASE_VERSION_FULL).tar.xz:



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/dfc2363e9cbf14a74ff836179dcb95748b318901

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/dfc2363e9cbf14a74ff836179dcb95748b318901
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance