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

contrib: qt: only detect the native tools once 

When not cross-compiling, we assume the tools match the Qt6 package.
We don't need to check again the binary as it will have no effect.
This commit is contained in:
Steve Lhomme 2024-04-17 10:03:55 +02:00 committed by Jean-Baptiste Kempf
parent 6140b72e70
commit 4615108661
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,8 +27,7 @@ PKGS_FOUND += qt
endif
ifndef HAVE_CROSS_COMPILE
PKGS_FOUND += qt-tools
endif
ifeq ($(call system_tool_version, moc --version),$(QTBASE_VERSION_MAJOR))
else ifeq ($(call system_tool_version, moc --version),$(QTBASE_VERSION_MAJOR))
PKGS_FOUND += qt-tools
endif

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

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

3
contrib/src/qtshadertools/rules.mak
View File

@ -28,8 +28,7 @@ PKGS_FOUND += qtshadertools
endif
ifndef HAVE_CROSS_COMPILE
PKGS_FOUND += qtshadertools-tools
endif
ifeq ($(call system_tool_majmin, qsb --version),$(QTSHADERTOOLS_VERSION_MAJOR))
else ifeq ($(call system_tool_majmin, qsb --version),$(QTSHADERTOOLS_VERSION_MAJOR))
PKGS_FOUND += qtshadertools-tools
endif