[vlc-commits] [Git][videolan/vlc][master] contrib: qt: fix the moc version detection
Steve Lhomme (@robUx4)
gitlab at videolan.org
Fri May 17 11:16:02 UTC 2024
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
194d62d7 by Steve Lhomme at 2024-05-17T10:14:08+00:00
contrib: qt: fix the moc version detection
Following 6140b72e706b9a29b6fb78c9210bc1483905bfaa we check moc instead of qt-cmake.
But we should use system_tool_majmin in this case, like the other tools.
Fixes this line written each time make is called:
> /bin/sh: 1: Syntax error: end of file unexpected
- - - - -
1 changed file:
- contrib/src/qt/rules.mak
Changes:
=====================================
contrib/src/qt/rules.mak
=====================================
@@ -27,7 +27,7 @@ PKGS_FOUND += qt
endif
ifndef HAVE_CROSS_COMPILE
PKGS_FOUND += qt-tools
-else ifeq ($(call system_tool_version, moc --version),$(QTBASE_VERSION_MAJOR))
+else ifeq ($(call system_tool_majmin, moc --version),$(QTBASE_VERSION_MAJOR))
PKGS_FOUND += qt-tools
endif
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/194d62d747ffbc5b3f58a4e53116244d26501ced
--
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/194d62d747ffbc5b3f58a4e53116244d26501ced
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list