aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2017-03-08 11:14:19 +0100
committerKarsten Heimrich <karsten.heimrich@qt.io>2017-03-08 10:30:36 +0000
commitccd9a9e690b519c5a088ae5562f860111d17d782 (patch)
tree096b628db6e62146210a8b9a1dfb950d89a378fe
parent64763d4f23ffcb8c2d17f25030dd49d227a5bbbd (diff)
Update to patch level release version 2.1.1
Change-Id: Ie68f4a12decd6dc197cc556da53ca6581abeb71f Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
-rw-r--r--Changelog4
-rw-r--r--src/config/12.0/qtvstools.targets2
-rw-r--r--src/config/12.0/source.extension.vsixmanifest2
-rw-r--r--src/config/14.0/qtvstools.targets2
-rw-r--r--src/config/14.0/source.extension.vsixmanifest2
-rw-r--r--src/qtprojectlib/Properties/AssemblyInfo.cs4
-rw-r--r--src/qtvstools/Properties/AssemblyInfo.cs4
-rw-r--r--src/qtvstools/Vsix.cs2
-rw-r--r--vstools.pri4
9 files changed, 14 insertions, 12 deletions
diff --git a/Changelog b/Changelog
index 482fc261..eaba4bae 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,6 @@
-The Qt Visual Studio Tools version 2.1.0. contains improvements for QML syntax highlighting and
+The Qt Visual Studio Tools version 2.1.1 contains a bug fix for QTVSADDINBUG-453
+
+The Qt Visual Studio Tools version 2.1.0 contains improvements for QML syntax highlighting and
several bug fixes.
- Some speed improvements while importing large qmake based projects
diff --git a/src/config/12.0/qtvstools.targets b/src/config/12.0/qtvstools.targets
index dff6a956..e5ac1b5a 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.1.0</VsixVersion>
+ <VsixVersion Condition="'$(VsixVersion)' == ''">2.1.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 735ba489..e51eedc1 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.1.0" Language="en-US"
+ <Identity Id="QtVsTools.15021976-cd02-4fd0-89bd-e36f85abe16a" Version="2.1.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 6ed4447b..180b5092 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.1.0</VsixVersion>
+ <VsixVersion Condition="'$(VsixVersion)' == ''">2.1.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 aaf771f3..dd470203 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.1.0" Language="en-US"
+ <Identity Id="QtVsTools.30112013-cd02-4fd0-89bd-e36f85abe16a" Version="2.1.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/qtprojectlib/Properties/AssemblyInfo.cs b/src/qtprojectlib/Properties/AssemblyInfo.cs
index a571ff42..5badcdc6 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.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]
diff --git a/src/qtvstools/Properties/AssemblyInfo.cs b/src/qtvstools/Properties/AssemblyInfo.cs
index bcfaaf1a..5159e844 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.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]
diff --git a/src/qtvstools/Vsix.cs b/src/qtvstools/Vsix.cs
index 5c125640..2813d07e 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.1.0", IconResourceID = 400)]
+ [InstalledProductRegistration("#110", "#112", "2.1.1", IconResourceID = 400)]
[ProvideMenuResource("Menus.ctmenu", 1)]
[ProvideAutoLoad(Microsoft.VisualStudio.Shell.Interop.UIContextGuids.SolutionExists)]
public sealed class Vsix : Package
diff --git a/vstools.pri b/vstools.pri
index 7b203feb..6cabab4c 100644
--- a/vstools.pri
+++ b/vstools.pri
@@ -2,8 +2,8 @@
error("vstools.pri already included")
}
QTVSTOOLS_PRI = 1
-QTVSTOOLS_VERSION = 2.1.0
-QTVSTOOLS_VERSION_TAG = 210
+QTVSTOOLS_VERSION = 2.1.1
+QTVSTOOLS_VERSION_TAG = 211
defineTest(minQtVersion) {
maj = $$1