diff options
Diffstat (limited to 'src/qtvstools')
-rw-r--r-- | src/qtvstools/DteEventsHandler.cs | 6 | ||||
-rw-r--r-- | src/qtvstools/QtVsTools.csproj | 99 |
2 files changed, 105 insertions, 0 deletions
diff --git a/src/qtvstools/DteEventsHandler.cs b/src/qtvstools/DteEventsHandler.cs index 03c6da89..516bc585 100644 --- a/src/qtvstools/DteEventsHandler.cs +++ b/src/qtvstools/DteEventsHandler.cs @@ -598,6 +598,9 @@ namespace QtVsTools return; if (!HelperFunctions.IsQtProject(vcPrj)) return; + // Ignore property events when using shared compiler properties + if (QtProject.GetFormatVersion(vcPrj) >= Resources.qtMinFormatVersion_ClProperties) + return; if (dispid == dispId_VCCLCompilerTool_UsePrecompiledHeader || dispid == dispId_VCCLCompilerTool_PrecompiledHeaderThrough @@ -627,6 +630,9 @@ namespace QtVsTools return; if (!HelperFunctions.IsQtProject(vcPrj)) return; + // Ignore property events when using shared compiler properties + if (QtProject.GetFormatVersion(vcPrj) >= Resources.qtMinFormatVersion_ClProperties) + return; if (dispid == dispId_VCFileConfiguration_ExcludedFromBuild) { var qtPrj = QtProject.Create(vcPrj); diff --git a/src/qtvstools/QtVsTools.csproj b/src/qtvstools/QtVsTools.csproj index 54ab5cd1..d75c8d43 100644 --- a/src/qtvstools/QtVsTools.csproj +++ b/src/qtvstools/QtVsTools.csproj @@ -598,6 +598,39 @@ <IncludeInVSIX>true</IncludeInVSIX> <SubType>Designer</SubType> </Content> + <T4Template Include="..\qtmsbuild\moc\qtmoc_cl.xml_TT"> + <Link>QtMsBuild\moc\qtmoc_cl.xml_TT</Link> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>..\qtmsbuild\moc\qtmoc_cl.xml</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>qtmoc_cl.xml</LastGenOutput> + <SubType>Designer</SubType> + </T4Template> + <Content Include="..\qtmsbuild\moc\qtmoc_cl.xml"> + <Link>QtMsBuild\moc\qtmoc_cl.xml</Link> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>qtmoc_cl.xml_TT</DependentUpon> + <SubType>Designer</SubType> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <IncludeInVSIX>true</IncludeInVSIX> + </Content> + <T4Template Include="..\qtmsbuild\moc\qtmoc_cl.targets_TT"> + <Link>QtMsBuild\moc\qtmoc_cl.targets_TT</Link> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>..\qtmsbuild\moc\qtmoc_cl.targets</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <SubType>Designer</SubType> + <LastGenOutput>qtmoc_cl.targets</LastGenOutput> + </T4Template> + <Content Include="..\qtmsbuild\moc\qtmoc_cl.targets"> + <Link>QtMsBuild\moc\qtmoc_cl.targets</Link> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>qtmoc_cl.targets_TT</DependentUpon> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <IncludeInVSIX>true</IncludeInVSIX> + </Content> <!-- /////////////////////////////////////////////////////////////////////////////////////////////// // Qt/MSBuild qml property pages and targets @@ -659,6 +692,39 @@ <IncludeInVSIX>true</IncludeInVSIX> <SubType>Designer</SubType> </Content> + <T4Template Include="..\qtmsbuild\rcc\qtrcc_cl.xml_TT"> + <Link>QtMsBuild\rcc\qtrcc_cl.xml_TT</Link> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>..\qtmsbuild\rcc\qtrcc_cl.xml</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>qtrcc_cl.xml</LastGenOutput> + <SubType>Designer</SubType> + </T4Template> + <Content Include="..\qtmsbuild\rcc\qtrcc_cl.xml"> + <Link>QtMsBuild\rcc\qtrcc_cl.xml</Link> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>qtrcc_cl.xml_TT</DependentUpon> + <SubType>Designer</SubType> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <IncludeInVSIX>true</IncludeInVSIX> + </Content> + <T4Template Include="..\qtmsbuild\rcc\qtrcc_cl.targets_TT"> + <Link>QtMsBuild\rcc\qtrcc_cl.targets_TT</Link> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>..\qtmsbuild\rcc\qtrcc_cl.targets</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <SubType>Designer</SubType> + <LastGenOutput>qtrcc_cl.targets</LastGenOutput> + </T4Template> + <Content Include="..\qtmsbuild\rcc\qtrcc_cl.targets"> + <Link>QtMsBuild\rcc\qtrcc_cl.targets</Link> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>qtrcc_cl.targets_TT</DependentUpon> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <IncludeInVSIX>true</IncludeInVSIX> + </Content> <!-- /////////////////////////////////////////////////////////////////////////////////////////////// // Qt/MSBuild repc property pages and targets @@ -687,6 +753,39 @@ <IncludeInVSIX>true</IncludeInVSIX> <SubType>Designer</SubType> </Content> + <T4Template Include="..\qtmsbuild\repc\qtrepc_cl.xml_TT"> + <Link>QtMsBuild\repc\qtrepc_cl.xml_TT</Link> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>..\qtmsbuild\repc\qtrepc_cl.xml</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <LastGenOutput>qtrepc_cl.xml</LastGenOutput> + <SubType>Designer</SubType> + </T4Template> + <Content Include="..\qtmsbuild\repc\qtrepc_cl.xml"> + <Link>QtMsBuild\repc\qtrepc_cl.xml</Link> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>qtrepc_cl.xml_TT</DependentUpon> + <SubType>Designer</SubType> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <IncludeInVSIX>true</IncludeInVSIX> + </Content> + <T4Template Include="..\qtmsbuild\repc\qtrepc_cl.targets_TT"> + <Link>QtMsBuild\repc\qtrepc_cl.targets_TT</Link> + <Generator>TextTemplatingFileGenerator</Generator> + <OutputFile>..\qtmsbuild\repc\qtrepc_cl.targets</OutputFile> + <DependsOn>$(SolutionDir)\version.targets;$(SolutionDir)\version.tt;$(SolutionDir)\common.tt</DependsOn> + <SubType>Designer</SubType> + <LastGenOutput>qtrepc_cl.targets</LastGenOutput> + </T4Template> + <Content Include="..\qtmsbuild\repc\qtrepc_cl.targets"> + <Link>QtMsBuild\repc\qtrepc_cl.targets</Link> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>qtrepc_cl.targets_TT</DependentUpon> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + <IncludeInVSIX>true</IncludeInVSIX> + </Content> <!-- /////////////////////////////////////////////////////////////////////////////////////////////// // Qt/MSBuild uic property pages and targets |