diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2019-06-20 13:54:49 +0200 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2019-08-05 09:14:44 +0000 |
| commit | 805e9ed6f14fb0a4d9dd8ce6a23631ca215b304a (patch) | |
| tree | a2547e0712ccaf4ae0d5ddf864589471b0632b7a /src/qtmsbuild/qt_globals.targets | |
| parent | 5af356f6fbbeaf8f1feca5497e96c4a5b6cfc9df (diff) | |
Edit Qt settings in property pages (V3 format)
Qt settings are now configured in the project property pages. This
includes the possibility to have different versions of the Qt settings
per project configuration. Previously, the Qt settings were edited in a
custom dialog, allowing only a single version of the settings that
would apply to all project configurations.
This change breaks the current version of the support for Qt VS Tools
projects. A new version (V3) of the project format is introduced. This
new format allows Qt settings to be stored in the same way as other
project properties. Previous versions will still work and a later change
will introduce the possibility to convert from previous versions to V3.
Task-number: QTVSADDINBUG-575
Change-Id: I96ac9fff6d6db387756448245f0b1a155b3ba4d6
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/qtmsbuild/qt_globals.targets')
| -rw-r--r-- | src/qtmsbuild/qt_globals.targets | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/qtmsbuild/qt_globals.targets b/src/qtmsbuild/qt_globals.targets index b8bb6224..b979046b 100644 --- a/src/qtmsbuild/qt_globals.targets +++ b/src/qtmsbuild/qt_globals.targets @@ -326,6 +326,23 @@ <!-- /////////////////////////////////////////////////////////////////////////////////////////////// + // Update C++ sources with generated information + // --> + <PropertyGroup> + <QtIncludePath>@(QtIncludePath->Distinct())</QtIncludePath> + </PropertyGroup> + <ItemGroup> + <ClCompile_Updated Include="@(ClCompile)"> + <AdditionalIncludeDirectories +>$(QtIncludePath);%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile_Updated> + <ClCompile Remove="@(ClCompile)"/> + <ClCompile Include="@(ClCompile_Updated)"/> + <ClCompile_Updated Remove="@(ClCompile_Updated)"/> + </ItemGroup> + + <!-- + /////////////////////////////////////////////////////////////////////////////////////////////// // Clean-up // --> <ItemGroup> |