diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2019-06-11 12:17:28 +0200 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2019-06-11 11:45:15 +0000 |
| commit | f1917f3de882c53e738e1e8ac3e0be35c98354b3 (patch) | |
| tree | f74eed7b466043437f59b06679a61b10d34be86e | |
| parent | 1e0431d2fb4a52916e1697bc7033e67c0d33a407 (diff) | |
Link against static build of Qt for VS 2019
When building the Qt VS Tools in Visual Studio 2019, vsqml.dll is now
linked against the correct build of Qt, also compiled with VS 2019. In
earlier releases of the VS 2019 Preview, the platform toolset was still
the same as VS 2017. Since a recent update, VS 2019 now provides its
own platform toolset.
Task-number: QTVSADDINBUG-636
Change-Id: Ibd09227051900ce4be406859a3af498e08c32b5c
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/vsqml/vsqml.vcxproj | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/vsqml/vsqml.vcxproj b/src/vsqml/vsqml.vcxproj index c148329f..91633d54 100644 --- a/src/vsqml/vsqml.vcxproj +++ b/src/vsqml/vsqml.vcxproj @@ -80,15 +80,21 @@ <PropertyGroup Condition="'$(QtBuild_Static_Vs2017)'==''"> <QtBuild_Static_Vs2017>..\..\..\build\qt5-x86-vs2017-static</QtBuild_Static_Vs2017> </PropertyGroup> + <PropertyGroup Condition="'$(QtBuild_Static_Vs2019)'==''"> + <QtBuild_Static_Vs2019>..\..\..\build\qt5-x86-vs2019-static</QtBuild_Static_Vs2019> + </PropertyGroup> <PropertyGroup Condition="'$(VisualStudioVersion)'=='12.0'"> <QtBuild>$(QtBuild_Static_Vs2013)</QtBuild> </PropertyGroup> <PropertyGroup Condition="'$(VisualStudioVersion)'=='14.0'"> <QtBuild>$(QtBuild_Static_Vs2015)</QtBuild> </PropertyGroup> - <PropertyGroup Condition="'$(VisualStudioVersion)'=='15.0' OR '$(VisualStudioVersion)'=='16.0'"> + <PropertyGroup Condition="'$(VisualStudioVersion)'=='15.0'"> <QtBuild>$(QtBuild_Static_Vs2017)</QtBuild> </PropertyGroup> + <PropertyGroup Condition="'$(VisualStudioVersion)'=='16.0'"> + <QtBuild>$(QtBuild_Static_Vs2019)</QtBuild> + </PropertyGroup> <PropertyGroup> <QtBuild>$([System.IO.Path]::Combine($(ProjectDir),$(QtBuild)))</QtBuild> <QtBuild>$([System.IO.Path]::GetFullPath($(QtBuild)))</QtBuild> |