diff options
Diffstat (limited to 'src/qtmsbuild/repc')
| -rw-r--r-- | src/qtmsbuild/repc/qtrepc.props | 3 | ||||
| -rw-r--r-- | src/qtmsbuild/repc/qtrepc.targets | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/qtmsbuild/repc/qtrepc.props b/src/qtmsbuild/repc/qtrepc.props index ebf1dee8..0d81485c 100644 --- a/src/qtmsbuild/repc/qtrepc.props +++ b/src/qtmsbuild/repc/qtrepc.props @@ -49,7 +49,8 @@ <ItemDefinitionGroup> <QtRepc> <ExecutionDescription>repc %(Identity)</ExecutionDescription> - <QTDIR>$(QTDIR)</QTDIR> + <QTDIR Condition="'$(QtVsProjectSettings)' == 'true'">$(QtInstallDir)</QTDIR> + <QTDIR Condition="'$(QtVsProjectSettings)' != 'true'">$(QTDIR)</QTDIR> <InputFile>%(FullPath)</InputFile> <OutputFileType>replica</OutputFileType> <OutputFile><![CDATA[$(IntDir)\repc\rep_%(Filename)_%<OutputFileType>.h]]></OutputFile> diff --git a/src/qtmsbuild/repc/qtrepc.targets b/src/qtmsbuild/repc/qtrepc.targets index c8bd0bf4..94418476 100644 --- a/src/qtmsbuild/repc/qtrepc.targets +++ b/src/qtmsbuild/repc/qtrepc.targets @@ -267,7 +267,8 @@ <ItemGroup Condition="'$(run_parallel)' == 'true' OR '$(run_single)' == 'true'"> <QtWork Include="@(QtRepc)"> <WorkType>repc</WorkType> - <ToolPath>%(QtRepc.QTDIR)\bin\repc.exe</ToolPath> + <ToolPath Condition="'$(QtVsProjectSettings)' == 'true'">$(QtToolsPath)\repc.exe</ToolPath> + <ToolPath Condition="'$(QtVsProjectSettings)' != 'true'">%(QtRepc.QTDIR)\bin\repc.exe</ToolPath> <Options>$(options)</Options> <Message>%(QtRepc.ExecutionDescription)</Message> <DependenciesChanged>$(dependencies_changed)</DependenciesChanged> |