diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2019-07-08 16:42:53 +0200 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2019-08-05 09:15:54 +0000 |
| commit | 3e7709dcf5927f5674cccc253ecefae3ab758166 (patch) | |
| tree | 1853ab03ada2db130e7774d88c4c36dfb8021730 /src/qtmsbuild/moc/qtmoc.props | |
| parent | d3df725584b6107fc54d9f9db6201ece457f69fc (diff) | |
Use V3 format settings with Qt tools
This change updates the existing property pages for Qt tools with the
features introduced by the V3 project format.
Task-number: QTVSADDINBUG-575
Change-Id: I37867cc616677fe18b99649b0bff9371c2cf430d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/qtmsbuild/moc/qtmoc.props')
| -rw-r--r-- | src/qtmsbuild/moc/qtmoc.props | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/qtmsbuild/moc/qtmoc.props b/src/qtmsbuild/moc/qtmoc.props index 6f7c9b8e..9d1be76b 100644 --- a/src/qtmsbuild/moc/qtmoc.props +++ b/src/qtmsbuild/moc/qtmoc.props @@ -48,9 +48,22 @@ <ItemDefinitionGroup> <QtMoc> <ExecutionDescription>moc %(Identity)</ExecutionDescription> - <QTDIR>$(QTDIR)</QTDIR> + + <QTDIR Condition="'$(QtVsProjectSettings)' != 'true'" + >$(QTDIR)</QTDIR> + <QTDIR Condition="'$(QtVsProjectSettings)' == 'true'" + >$(QtInstallDir)</QTDIR> + <InputFile>%(FullPath)</InputFile> - <OutputFile>$(ProjectDir)GeneratedFiles\$(Configuration)\moc_%(Filename).cpp</OutputFile> + + <OutputFile Condition="'$(QtVsProjectSettings)' != 'true'" + >$(ProjectDir)GeneratedFiles\$(Configuration)\moc_%(Filename).cpp</OutputFile> + + <QtMocDir Condition="'$(QtVsProjectSettings)' == 'true'" + >$(IntDir)\moc\%(RelativeDir)</QtMocDir> + <QtMocFileName Condition="'$(QtVsProjectSettings)' == 'true'" + >moc_%(Filename).cpp</QtMocFileName> + <DynamicSource>output</DynamicSource> <ParallelProcess>true</ParallelProcess> <CommandLineTemplate>[AllOptions] [AdditionalOptions]</CommandLineTemplate> |