From ca47896204482bf4a6979e3838bf7f09f61cebeb Mon Sep 17 00:00:00 2001
From: giy <giy@omp-system.ru>
Date: Fri, 02 Sep 2022 14:16:56 +0300
Subject: [PATCH] Обновление до версии 2.9.0
---
QtMSBuild/QtMsBuild/translation/qttranslation.targets | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/QtMSBuild/QtMsBuild/translation/qttranslation.targets b/QtMSBuild/QtMsBuild/translation/qttranslation.targets
index 6b599f9..4f15175 100644
--- a/QtMSBuild/QtMsBuild/translation/qttranslation.targets
+++ b/QtMSBuild/QtMsBuild/translation/qttranslation.targets
@@ -90,10 +90,14 @@
<QtTranslation>
<InputFiles
>$(QtTranslationInput)</InputFiles>
- <LUpdate
+ <LUpdate Condition="'$(ApplicationType)' == 'Linux'"
>$(QtToolsPath)/lupdate</LUpdate>
- <LRelease
+ <LRelease Condition="'$(ApplicationType)' == 'Linux'"
>$(QtToolsPath)/lrelease</LRelease>
+ <LUpdate Condition="'$(ApplicationType)' != 'Linux'"
+ >$(QtToolsPath)/lupdate.exe</LUpdate>
+ <LRelease Condition="'$(ApplicationType)' != 'Linux'"
+ >$(QtToolsPath)/lrelease.exe</LRelease>
<TsFile
>%(Identity)</TsFile>
<QmFile
@@ -395,6 +399,7 @@
<Cmd>$(Cmd.Trim())</Cmd>
</PropertyGroup>
<HostExec
+ Condition="Exists(@(Options->'%(CmdExec)', ''))"
Message="%(QtTranslationUpdate.UpdateDescription)"
Command="$(Cmd)"
Inputs="@(Options->'%(InputListFile)');@(Options->'%(InputFiles)')"
@@ -402,6 +407,9 @@
RemoteTarget="$(ResolvedRemoteTarget)"
RemoteProjectDir="$(_ResolvedRemoteProjectDir)">
</HostExec>
+ <Warning
+ Condition="!Exists(@(Options->'%(CmdExec)', ''))"
+ File="%(QtTranslationUpdate.Identity)" Text="'lupdate' not found; skipping" />
<!--
///////////////////////////////////////////////////////////////////////////////////////////////
@@ -556,6 +564,7 @@
<Cmd>$(Cmd.Trim())</Cmd>
</PropertyGroup>
<HostExec
+ Condition="Exists(@(Options->'%(CmdExec)', ''))"
Message="%(QtTranslationRelease.ReleaseDescription)"
Command="$(Cmd)"
Inputs="@(Options->'%(InputFile)')"
@@ -563,6 +572,9 @@
RemoteTarget="$(ResolvedRemoteTarget)"
RemoteProjectDir="$(_ResolvedRemoteProjectDir)">
</HostExec>
+ <Warning
+ Condition="!Exists(@(Options->'%(CmdExec)', ''))"
+ File="%(QtTranslationRelease.Identity)" Text="'lrelease' not found; skipping" />
<!--
///////////////////////////////////////////////////////////////////////////////////////////////
--
Gitblit v1.9.1