diff options
author | Miguel Costa <miguel.costa@qt.io> | 2019-07-08 16:16:15 +0200 |
---|---|---|
committer | Miguel Costa <miguel.costa@qt.io> | 2019-08-05 09:24:17 +0000 |
commit | cff73364c3b632a84ab3c7ca2f2ea32b563910ce (patch) | |
tree | 41d0c87644f3322aa29709bae3d58529511cd7fc /src/qtmsbuild/rcc/qtrcc.targets | |
parent | 3e7709dcf5927f5674cccc253ecefae3ab758166 (diff) |
Add C++ compiler properties to Qt tools
Qt tools that generate C++ code will now include all properties
available in the C++ compiler property page, allowing the default values
of the C++ compiler properties to be used directly by the Qt tools,
without the need to actively monitor changes to maintain properties
synchronized. It is also possible to extend (i.e. append to) or override
(i.e. replace) the default C++ property values for Qt tools.
Task-number: QTVSADDINBUG-575
Task-number: QTVSADDINBUG-632
Change-Id: I456ee6b4926cd11c83c845656a617a4fb204542a
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/qtmsbuild/rcc/qtrcc.targets')
-rw-r--r-- | src/qtmsbuild/rcc/qtrcc.targets | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/qtmsbuild/rcc/qtrcc.targets b/src/qtmsbuild/rcc/qtrcc.targets index 8082bf80..292febe4 100644 --- a/src/qtmsbuild/rcc/qtrcc.targets +++ b/src/qtmsbuild/rcc/qtrcc.targets @@ -61,6 +61,9 @@ <PropertyPageSchema Condition="'$(QtVsProjectSettings)' == 'true'" Include="$(MSBuildThisFileDirectory)qtrcc_settings.xml" /> + <PropertyPageSchema + Condition="'$(QtVsProjectClProperties)' == 'true'" + Include="$(MSBuildThisFileDirectory)qtrcc_cl.xml" /> <AvailableItemName Include="QtRcc"> <Targets>Qt;_ClCompile</Targets> </AvailableItemName> @@ -201,6 +204,14 @@ <!-- ///////////////////////////////////////////////////////////////////////////////////////////////// + /// TARGET QtRccOverrideCpp + ///////////////////////////////////////////////////////////////////////////////////////////////// + // + // --> + <Import Project="qtrcc_cl.targets"/> + + <!-- + ///////////////////////////////////////////////////////////////////////////////////////////////// /// TARGET QtRcc ///////////////////////////////////////////////////////////////////////////////////////////////// // Process each QRC file and produce the corresponding QtWork items @@ -210,6 +221,7 @@ QtPrepare; QtRccPrepare; QtRccSetModified; + QtRccOverrideCpp; $(QtRccDependsOn) </QtRccDependsOn> </PropertyGroup> |