Update version number to 2.2.1v2.2.1

Change-Id: Ie3981b2c9aa4941d3485cca346368b8c86d09520
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

28 files changed, 68 insertions, 42 deletions

diff --git a/Changelog b/Changelog
index 9ad82199..d9c76b65 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,29 @@
+The Qt Visual Studio Tools version 2.2.1 contains several bug fixes.
+
+Changes
+-------
+- Fixed QTVSADDINBUG-509: Noticeable delays when saving any .cpp file in larger projects created
+  with previous versions of the Qt VS Tools
+- Fixed QTVSADDINBUG-510: Errors converting .pro files with long INCLUDEPATH definitions
+- Fixed QTVSADDINBUG-511: Incorrect usage of $(IntDir) in the definition of QtWorkFilePath
+- Fixed QTVSADDINBUG-512: PrecompiledHeaders.h include missing in moc after adding new class
+- Fixed QTVSADDINBUG-514: Quotes removed from preprocessor definition
+- Fixed QTVSADDINBUG-515: Visual Studio unresponsive while Converting custom build to Qt/MSBuild
+- Fixed QTVSADDINBUG-520: Delay when starting build in solutions with many projects/configurations
+- Fixed QTVSADDINBUG-521: Unable to use Qt version if it was built with -qtlibinfix
+- Fixed QTVSADDINBUG-522: Duplicating defines and include paths from moc in the C++ dynamic source
+- Fixed QTVSADDINBUG-523: Qt VS Tools stopped working with static builds
+- Fixed QTVSADDINBUG-530: When a file includes the generated moc output for a header file as well
+  as its own generated moc output then it will fail to build
+- Fixed QTVSADDINBUG-531: Project not being built when a .uic or .qrc file is changed
+- Fixed QTVSADDINBUG-532: Delay when continuing execution after hitting breakpoint
+- Fixed QTVSADDINBUG-533: Errors in conversion to Qt/MSBuild when using MOC_DIR or the '@' option
+- Fixed QTVSADDINBUG-534: Problems with inheritance of properties defined in property sheets.
+- Fixed QTVSADDINBUG-535: Problems with incremental build
+- Fixed QTVSADDINBUG-537: Delay after changing C++ properties in large project
+- Fixed QTVSADDINBUG-538: Incorrect escaping of paths in command line strings
+
+
 The Qt Visual Studio Tools version 2.2.0 is the first official release of the Visual Studio add-in
 for Visual Studio 2017, 2015 and 2013.
 
diff --git a/src/config/12.0/qtvstools.targets b/src/config/12.0/qtvstools.targets
index a7008193..21e69d61 100644
--- a/src/config/12.0/qtvstools.targets
+++ b/src/config/12.0/qtvstools.targets
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2013</DefineConstants>
-    <VsixVersion Condition="'$(VsixVersion)' == ''">2.2.0</VsixVersion>
+    <VsixVersion Condition="'$(VsixVersion)' == ''">2.2.1</VsixVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(VisualStudioVersion)' == '12.0' ">
diff --git a/src/config/12.0/source.extension.vsixmanifest b/src/config/12.0/source.extension.vsixmanifest
index e8cfb235..3e17449c 100644
--- a/src/config/12.0/source.extension.vsixmanifest
+++ b/src/config/12.0/source.extension.vsixmanifest
@@ -32,7 +32,7 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
     xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="QtVsTools.15021976-cd02-4fd0-89bd-e36f85abe16a" Version="2.2.0" Language="en-US"
+        <Identity Id="QtVsTools.15021976-cd02-4fd0-89bd-e36f85abe16a" Version="2.2.1" Language="en-US"
             Publisher="The Qt Company Ltd." />
         <DisplayName>Qt Visual Studio Tools</DisplayName>
         <Description xml:space="preserve">The Qt Visual Studio Tools allow developers to use the standard development environment without having to worry about any Qt-related build steps or tools.</Description>
diff --git a/src/config/14.0/qtvstools.targets b/src/config/14.0/qtvstools.targets
index 00cb576b..11f12c6c 100644
--- a/src/config/14.0/qtvstools.targets
+++ b/src/config/14.0/qtvstools.targets
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2015</DefineConstants>
-    <VsixVersion Condition="'$(VsixVersion)' == ''">2.2.0</VsixVersion>
+    <VsixVersion Condition="'$(VsixVersion)' == ''">2.2.1</VsixVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(VisualStudioVersion)' == '14.0' ">
diff --git a/src/config/14.0/source.extension.vsixmanifest b/src/config/14.0/source.extension.vsixmanifest
index eb5cbeec..8f0d2316 100644
--- a/src/config/14.0/source.extension.vsixmanifest
+++ b/src/config/14.0/source.extension.vsixmanifest
@@ -32,7 +32,7 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
     xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="QtVsTools.30112013-cd02-4fd0-89bd-e36f85abe16a" Version="2.2.0" Language="en-US"
+        <Identity Id="QtVsTools.30112013-cd02-4fd0-89bd-e36f85abe16a" Version="2.2.1" Language="en-US"
             Publisher="The Qt Company Ltd." />
         <DisplayName>Qt Visual Studio Tools</DisplayName>
         <Description xml:space="preserve">The Qt Visual Studio Tools allow developers to use the standard development environment without having to worry about any Qt-related build steps or tools.</Description>
diff --git a/src/config/15.0/qtvstools.targets b/src/config/15.0/qtvstools.targets
index ba21d094..5d957e4d 100644
--- a/src/config/15.0/qtvstools.targets
+++ b/src/config/15.0/qtvstools.targets
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);VS2017</DefineConstants>
-    <VsixVersion Condition="'$(VsixVersion)' == ''">2.2.0</VsixVersion>
+    <VsixVersion Condition="'$(VsixVersion)' == ''">2.2.1</VsixVersion>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(VisualStudioVersion)' == '15.0' ">
diff --git a/src/config/15.0/source.extension.vsixmanifest b/src/config/15.0/source.extension.vsixmanifest
index f4bff2d0..c5ae1477 100644
--- a/src/config/15.0/source.extension.vsixmanifest
+++ b/src/config/15.0/source.extension.vsixmanifest
@@ -32,7 +32,7 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011"
     xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="QtVsTools.13121978-cd02-4fd0-89bd-e36f85abe16a" Version="2.2.0" Language="en-US"
+        <Identity Id="QtVsTools.13121978-cd02-4fd0-89bd-e36f85abe16a" Version="2.2.1" Language="en-US"
             Publisher="The Qt Company Ltd." />
         <DisplayName>Qt Visual Studio Tools</DisplayName>
         <Description xml:space="preserve">The Qt Visual Studio Tools allow developers to use the standard development environment without having to worry about any Qt-related build steps or tools.</Description>
diff --git a/src/qtappwrapper/Properties/AssemblyInfo.cs b/src/qtappwrapper/Properties/AssemblyInfo.cs
index e5abab43..36f6246d 100644
--- a/src/qtappwrapper/Properties/AssemblyInfo.cs
+++ b/src/qtappwrapper/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qtprojectlib/Properties/AssemblyInfo.cs b/src/qtprojectlib/Properties/AssemblyInfo.cs
index 5ad5c708..dfb22281 100644
--- a/src/qtprojectlib/Properties/AssemblyInfo.cs
+++ b/src/qtprojectlib/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qttemplates/console/Properties/AssemblyInfo.cs b/src/qttemplates/console/Properties/AssemblyInfo.cs
index 4865d91c..d75e1b82 100644
--- a/src/qttemplates/console/Properties/AssemblyInfo.cs
+++ b/src/qttemplates/console/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qttemplates/console/console.vstemplate b/src/qttemplates/console/console.vstemplate
index 5836ff65..4c6082cb 100644
--- a/src/qttemplates/console/console.vstemplate
+++ b/src/qttemplates/console/console.vstemplate
@@ -56,7 +56,7 @@
         </Project>
     </TemplateContent>
     <WizardExtension>
-        <Assembly>QtProjectWizard, Version=2.2.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+        <Assembly>QtProjectWizard, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null</Assembly>
         <FullClassName>QtProjectWizard.ConsoleWizard</FullClassName>
     </WizardExtension>
 </VSTemplate>
diff --git a/src/qttemplates/designer/Properties/AssemblyInfo.cs b/src/qttemplates/designer/Properties/AssemblyInfo.cs
index 2aea0ae1..1c7119ad 100644
--- a/src/qttemplates/designer/Properties/AssemblyInfo.cs
+++ b/src/qttemplates/designer/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qttemplates/designer/designer.vstemplate b/src/qttemplates/designer/designer.vstemplate
index ae58307e..6745cca3 100644
--- a/src/qttemplates/designer/designer.vstemplate
+++ b/src/qttemplates/designer/designer.vstemplate
@@ -67,7 +67,7 @@
         </Project>
     </TemplateContent>
     <WizardExtension>
-        <Assembly>QtProjectWizard, Version=2.2.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+        <Assembly>QtProjectWizard, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null</Assembly>
         <FullClassName>QtProjectWizard.DesignerWizard</FullClassName>
     </WizardExtension>
 </VSTemplate>
diff --git a/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs b/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs
index ba9239d8..a158deb2 100644
--- a/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs
+++ b/src/qttemplates/dialogbuttonbottom/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs b/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs
index a3c35175..257d2e74 100644
--- a/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs
+++ b/src/qttemplates/dialogbuttonright/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qttemplates/gui/Properties/AssemblyInfo.cs b/src/qttemplates/gui/Properties/AssemblyInfo.cs
index c445afaf..35b031a0 100644
--- a/src/qttemplates/gui/Properties/AssemblyInfo.cs
+++ b/src/qttemplates/gui/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qttemplates/gui/gui.vstemplate b/src/qttemplates/gui/gui.vstemplate
index fe3f56c5..b62f86c3 100644
--- a/src/qttemplates/gui/gui.vstemplate
+++ b/src/qttemplates/gui/gui.vstemplate
@@ -65,7 +65,7 @@
         </Project>
     </TemplateContent>
     <WizardExtension>
-        <Assembly>QtProjectWizard, Version=2.2.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+        <Assembly>QtProjectWizard, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null</Assembly>
         <FullClassName>QtProjectWizard.GuiWizard</FullClassName>
     </WizardExtension>
 </VSTemplate>
diff --git a/src/qttemplates/lib/Properties/AssemblyInfo.cs b/src/qttemplates/lib/Properties/AssemblyInfo.cs
index a3fcd325..75cb4e0b 100644
--- a/src/qttemplates/lib/Properties/AssemblyInfo.cs
+++ b/src/qttemplates/lib/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qttemplates/lib/lib.vstemplate b/src/qttemplates/lib/lib.vstemplate
index bb52c115..99f3ca06 100644
--- a/src/qttemplates/lib/lib.vstemplate
+++ b/src/qttemplates/lib/lib.vstemplate
@@ -63,7 +63,7 @@
         </Project>
     </TemplateContent>
     <WizardExtension>
-        <Assembly>QtProjectWizard, Version=2.2.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+        <Assembly>QtProjectWizard, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null</Assembly>
         <FullClassName>QtProjectWizard.LibraryWizard</FullClassName>
     </WizardExtension>
 </VSTemplate>
diff --git a/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs b/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs
index 979382ea..72eece55 100644
--- a/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs
+++ b/src/qttemplates/mainwindow/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qttemplates/resource/Properties/AssemblyInfo.cs b/src/qttemplates/resource/Properties/AssemblyInfo.cs
index 6d33abe3..8ef1b640 100644
--- a/src/qttemplates/resource/Properties/AssemblyInfo.cs
+++ b/src/qttemplates/resource/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qttemplates/server/Properties/AssemblyInfo.cs b/src/qttemplates/server/Properties/AssemblyInfo.cs
index 49bb7124..e1465e4c 100644
--- a/src/qttemplates/server/Properties/AssemblyInfo.cs
+++ b/src/qttemplates/server/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qttemplates/server/server.vstemplate b/src/qttemplates/server/server.vstemplate
index 6c25e98c..1b106e12 100644
--- a/src/qttemplates/server/server.vstemplate
+++ b/src/qttemplates/server/server.vstemplate
@@ -69,7 +69,7 @@
         </Project>
     </TemplateContent>
     <WizardExtension>
-        <Assembly>QtProjectWizard, Version=2.2.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+        <Assembly>QtProjectWizard, Version=2.2.1.0, Culture=neutral, PublicKeyToken=null</Assembly>
         <FullClassName>QtProjectWizard.ServerWizard</FullClassName>
     </WizardExtension>
 </VSTemplate>
diff --git a/src/qttemplates/widget/Properties/AssemblyInfo.cs b/src/qttemplates/widget/Properties/AssemblyInfo.cs
index 00bc1096..fde13344 100644
--- a/src/qttemplates/widget/Properties/AssemblyInfo.cs
+++ b/src/qttemplates/widget/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qtvstools/Properties/AssemblyInfo.cs b/src/qtvstools/Properties/AssemblyInfo.cs
index e0a056cb..b248205a 100644
--- a/src/qtvstools/Properties/AssemblyInfo.cs
+++ b/src/qtvstools/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/src/qtvstools/Vsix.cs b/src/qtvstools/Vsix.cs
index b296e425..c3bd15a9 100644
--- a/src/qtvstools/Vsix.cs
+++ b/src/qtvstools/Vsix.cs
@@ -40,7 +40,7 @@ namespace QtVsTools
 {
     [Guid(PackageGuid)]
     [PackageRegistration(UseManagedResourcesOnly = true)]
-    [InstalledProductRegistration("#110", "#112", "2.2.0", IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", "2.2.1", IconResourceID = 400)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideAutoLoad(Microsoft.VisualStudio.Shell.Interop.UIContextGuids.SolutionExists)]
     [ProvideAutoLoad(Microsoft.VisualStudio.Shell.Interop.UIContextGuids.NoSolution)]
diff --git a/src/qtwizard/Properties/AssemblyInfo.cs b/src/qtwizard/Properties/AssemblyInfo.cs
index 2e62a557..c3394332 100644
--- a/src/qtwizard/Properties/AssemblyInfo.cs
+++ b/src/qtwizard/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.2.1.0")]
+[assembly: AssemblyFileVersion("2.2.1.0")]
diff --git a/vstools.pri b/vstools.pri
index 84c31695..5bbceae0 100644
--- a/vstools.pri
+++ b/vstools.pri
@@ -2,8 +2,8 @@
     error("vstools.pri already included")
 }
 QTVSTOOLS_PRI = 1
-QTVSTOOLS_VERSION = 2.2.0
-QTVSTOOLS_VERSION_TAG = 220
+QTVSTOOLS_VERSION = 2.2.1
+QTVSTOOLS_VERSION_TAG = 221
 
 defineTest(minQtVersion) {
     maj = $$1