videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

contrib: qt: fix the native tools version detection 

We don't care about qt-cmake, it doesn't even match our Qt version.
We want to know the tools match the version we want to build.
This commit is contained in:
Steve Lhomme 2024-04-17 09:58:19 +02:00 committed by Jean-Baptiste Kempf
parent 6563bc3835
commit 6140b72e70
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/src/qt/rules.mak
View File

@ -28,7 +28,7 @@ endif
ifndef HAVE_CROSS_COMPILE
PKGS_FOUND += qt-tools
endif
ifeq ($(call system_tool_version, qt-cmake --version),3.22)
ifeq ($(call system_tool_version, moc --version),$(QTBASE_VERSION_MAJOR))
PKGS_FOUND += qt-tools
endif

2
contrib/src/qtdeclarative/rules.mak
View File

@ -25,7 +25,7 @@ endif
ifndef HAVE_CROSS_COMPILE
PKGS_FOUND += qtdeclarative-tools
endif
ifeq ($(call system_tool_majmin, qml --version),$(QTDECLARATIVE_VERSION_MAJOR))
ifeq ($(call system_tool_majmin, qmlcachegen --version),$(QTDECLARATIVE_VERSION_MAJOR))
PKGS_FOUND += qtshadertools-tools
endif