diff options
author | Karsten Heimrich <karsten.heimrich@qt.io> | 2022-03-28 11:42:56 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2022-04-05 11:18:45 +0000 |
commit | b11f42de79c296b4c56d971929c2b25a57f5a267 (patch) | |
tree | 6fb9374223007649b7d347f9e6685a9e435232c1 | |
parent | 09bfc904393893046e3d706f8ca5b69e43e28683 (diff) |
Hide the legacy "Set Solution's Qt Version" menu for new projects
* Move some code into Legacy namespace
Change-Id: I7c04fd3a7fffcc5d766b98976b533230105952ce
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
-rw-r--r-- | QtVsTools.Core/Legacy/QtVersionManager.cs | 63 | ||||
-rw-r--r-- | QtVsTools.Core/ProjectImporter.cs | 4 | ||||
-rw-r--r-- | QtVsTools.Core/QtVersionManager.cs | 36 | ||||
-rw-r--r-- | QtVsTools.Core/QtVsTools.Core.csproj | 3 | ||||
-rw-r--r-- | QtVsTools.Package/Legacy/ChangeFor.cs (renamed from QtVsTools.Package/Package/ChangeFor.cs) | 4 | ||||
-rw-r--r-- | QtVsTools.Package/Legacy/FormChangeQtVersion.Designer.cs (renamed from QtVsTools.Package/Package/FormChangeQtVersion.Designer.cs) | 2 | ||||
-rw-r--r-- | QtVsTools.Package/Legacy/FormChangeQtVersion.cs (renamed from QtVsTools.Package/Package/FormChangeQtVersion.cs) | 24 | ||||
-rw-r--r-- | QtVsTools.Package/Legacy/FormChangeQtVersion.resx (renamed from QtVsTools.Package/Package/FormChangeQtVersion.resx) | 54 | ||||
-rw-r--r-- | QtVsTools.Package/Package/QtMainMenu.cs | 6 | ||||
-rw-r--r-- | QtVsTools.Package/Package/QtProjectContextMenu.cs | 6 | ||||
-rw-r--r-- | QtVsTools.Package/Package/QtSolutionContextMenu.cs | 41 | ||||
-rw-r--r-- | QtVsTools.Package/QtVsTools.Package.csproj | 8 | ||||
-rw-r--r-- | QtVsTools.Package/Resources.resx | 6 |
13 files changed, 149 insertions, 108 deletions
diff --git a/QtVsTools.Core/Legacy/QtVersionManager.cs b/QtVsTools.Core/Legacy/QtVersionManager.cs new file mode 100644 index 00000000..076bd10a --- /dev/null +++ b/QtVsTools.Core/Legacy/QtVersionManager.cs @@ -0,0 +1,63 @@ +/**************************************************************************** +** +** Copyright (C) 2022 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt VS Tools. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +using Microsoft.VisualStudio.Shell; + +namespace QtVsTools.Core.Legacy +{ + public static class QtVersionManager + { + public static string GetSolutionQtVersion(EnvDTE.Solution solution) + { + ThreadHelper.ThrowIfNotOnUIThread(); + + if (solution == null) + return null; + + if (solution.Globals.get_VariableExists("Qt5Version")) { + var version = (string)solution.Globals["Qt5Version"]; + return Core.QtVersionManager.The().VerifyIfQtVersionExists(version) ? version : null; + } + + return null; + } + + public static bool SaveSolutionQtVersion(EnvDTE.Solution solution, string version) + { + ThreadHelper.ThrowIfNotOnUIThread(); + + if (!Core.QtVersionManager.The().IsVersionAvailable(version) && version != "$(DefaultQtVersion)") + return false; + + solution.Globals["Qt5Version"] = version; + if (!solution.Globals.get_VariablePersists("Qt5Version")) + solution.Globals.set_VariablePersists("Qt5Version", true); + return true; + } + } +} diff --git a/QtVsTools.Core/ProjectImporter.cs b/QtVsTools.Core/ProjectImporter.cs index 5556eb13..4f64a975 100644 --- a/QtVsTools.Core/ProjectImporter.cs +++ b/QtVsTools.Core/ProjectImporter.cs @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt VS Tools. @@ -93,7 +93,7 @@ namespace QtVsTools.Core if (CheckQtVersion(versionInfo)) { dteObject.Solution.Open(VCInfo.FullName); if (qtVersion != null) { - QtVersionManager.The().SaveSolutionQtVersion(dteObject.Solution, qtVersion); + Legacy.QtVersionManager.SaveSolutionQtVersion(dteObject.Solution, qtVersion); foreach (var prj in HelperFunctions.ProjectsInSolution(dteObject)) { QtVersionManager.The().SaveProjectQtVersion(prj, qtVersion); var qtPro = QtProject.Create(prj); diff --git a/QtVsTools.Core/QtVersionManager.cs b/QtVsTools.Core/QtVersionManager.cs index 6a3af271..c897e161 100644 --- a/QtVsTools.Core/QtVersionManager.cs +++ b/QtVsTools.Core/QtVersionManager.cs @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt VS Tools. @@ -299,7 +299,7 @@ namespace QtVsTools.Core key.Close(); } - private bool IsVersionAvailable(string version) + internal bool IsVersionAvailable(string version) { var versionAvailable = false; var versions = GetVersions(); @@ -364,7 +364,7 @@ namespace QtVsTools.Core } if (version == null) - version = GetSolutionQtVersion(project.DTE.Solution); + version = Legacy.QtVersionManager.GetSolutionQtVersion(project.DTE.Solution); return version; } @@ -414,34 +414,6 @@ namespace QtVsTools.Core } } - public bool SaveSolutionQtVersion(EnvDTE.Solution solution, string version) - { - ThreadHelper.ThrowIfNotOnUIThread(); - - if (!IsVersionAvailable(version) && version != "$(DefaultQtVersion)") - return false; - - solution.Globals["Qt5Version"] = version; - if (!solution.Globals.get_VariablePersists("Qt5Version")) - solution.Globals.set_VariablePersists("Qt5Version", true); - return true; - } - - public string GetSolutionQtVersion(EnvDTE.Solution solution) - { - ThreadHelper.ThrowIfNotOnUIThread(); - - if (solution == null) - return null; - - if (solution.Globals.get_VariableExists("Qt5Version")) { - var version = (string)solution.Globals["Qt5Version"]; - return VerifyIfQtVersionExists(version) ? version : null; - } - - return null; - } - public string GetDefaultVersion() { return GetDefaultVersion(Registry.CurrentUser); @@ -531,7 +503,7 @@ namespace QtVsTools.Core } } - private bool VerifyIfQtVersionExists(string version) + internal bool VerifyIfQtVersionExists(string version) { if (version == "$(DefaultQtVersion)") version = GetDefaultVersion(); diff --git a/QtVsTools.Core/QtVsTools.Core.csproj b/QtVsTools.Core/QtVsTools.Core.csproj index dd20d370..fbc2cc9c 100644 --- a/QtVsTools.Core/QtVsTools.Core.csproj +++ b/QtVsTools.Core/QtVsTools.Core.csproj @@ -97,7 +97,7 @@ <When Condition="'$(VisualStudioVersion)'=='16.0'"> <ItemGroup> <PackageReference Include="$(Name_Microsoft_VisualStudio_Validation)" Version="$(Version_Microsoft_VisualStudio_Validation)" /> - <PackageReference Include="$(Name_Microsoft_VisualStudio_VCProjectEngine)" Version="$(Version_Microsoft_VisualStudio_VCProjectEngine)"/> + <PackageReference Include="$(Name_Microsoft_VisualStudio_VCProjectEngine)" Version="$(Version_Microsoft_VisualStudio_VCProjectEngine)" /> </ItemGroup> </When> <When Condition="'$(VisualStudioVersion)'=='15.0'"> @@ -138,6 +138,7 @@ <Compile Include="ImageButton.cs"> <SubType>Component</SubType> </Compile> + <Compile Include="Legacy\QtVersionManager.cs" /> <Compile Include="LinkerToolWrapper.cs" /> <Compile Include="MainWinWrapper.cs" /> <Compile Include="Messages.cs" /> diff --git a/QtVsTools.Package/Package/ChangeFor.cs b/QtVsTools.Package/Legacy/ChangeFor.cs index 06577932..89c8758b 100644 --- a/QtVsTools.Package/Package/ChangeFor.cs +++ b/QtVsTools.Package/Legacy/ChangeFor.cs @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt VS Tools. @@ -26,7 +26,7 @@ ** ****************************************************************************/ -namespace QtVsTools +namespace QtVsTools.Legacy { public enum ChangeFor { Solution, Project } } diff --git a/QtVsTools.Package/Package/FormChangeQtVersion.Designer.cs b/QtVsTools.Package/Legacy/FormChangeQtVersion.Designer.cs index 216cf861..a88e36e7 100644 --- a/QtVsTools.Package/Package/FormChangeQtVersion.Designer.cs +++ b/QtVsTools.Package/Legacy/FormChangeQtVersion.Designer.cs @@ -1,4 +1,4 @@ -namespace QtVsTools +namespace QtVsTools.Legacy { partial class FormChangeQtVersion { diff --git a/QtVsTools.Package/Package/FormChangeQtVersion.cs b/QtVsTools.Package/Legacy/FormChangeQtVersion.cs index f4fea6ee..634d1d24 100644 --- a/QtVsTools.Package/Package/FormChangeQtVersion.cs +++ b/QtVsTools.Package/Legacy/FormChangeQtVersion.cs @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt VS Tools. @@ -30,13 +30,10 @@ using System; using System.Windows.Forms; using Microsoft.VisualStudio.Shell; -namespace QtVsTools +namespace QtVsTools.Legacy { - using Core; - public partial class FormChangeQtVersion : Form { - public FormChangeQtVersion() { ThreadHelper.ThrowIfNotOnUIThread(); @@ -52,8 +49,7 @@ namespace QtVsTools private void FormChangeQtVersion_Shown(object sender, EventArgs e) { - ThreadHelper.ThrowIfNotOnUIThread(); - Text = SR.GetString("SolutionQtVersion"); + Text = "Set Solution's Qt Version"; } void lbQtVersions_DoubleClick(object sender, EventArgs e) @@ -75,27 +71,27 @@ namespace QtVsTools ThreadHelper.ThrowIfNotOnUIThread(); lbQtVersions.Items.Clear(); - var vm = QtVersionManager.The(); + var vm = Core.QtVersionManager.The(); foreach (var versionName in vm.GetVersions()) lbQtVersions.Items.Add(versionName); lbQtVersions.Items.Add("$(DefaultQtVersion)"); - string qtVer = null; if (change == ChangeFor.Solution) { - qtVer = vm.GetSolutionQtVersion(QtVsToolsPackage.Instance.Dte.Solution); + var qtVer = Core.Legacy.QtVersionManager + .GetSolutionQtVersion(QtVsToolsPackage.Instance.Dte.Solution); if (qtVer == null) qtVer = vm.GetDefaultVersion(); if (qtVer != null) lbQtVersions.SelectedItem = qtVer; - Text = SR.GetString("SolutionQtVersion"); + Text = "Set Solution's Qt Version"; } else { - var pro = HelperFunctions.GetSelectedProject(QtVsToolsPackage.Instance.Dte); - qtVer = vm.GetProjectQtVersion(pro); + var pro = Core.HelperFunctions.GetSelectedProject(QtVsToolsPackage.Instance.Dte); + var qtVer = vm.GetProjectQtVersion(pro); if (qtVer == null) qtVer = vm.GetDefaultVersion(); if (qtVer != null) lbQtVersions.SelectedItem = qtVer; - Text = SR.GetString("ProjectQtVersion"); + Text = "Set Project's Qt Version"; } } diff --git a/QtVsTools.Package/Package/FormChangeQtVersion.resx b/QtVsTools.Package/Legacy/FormChangeQtVersion.resx index 19dc0dd8..08f1b248 100644 --- a/QtVsTools.Package/Package/FormChangeQtVersion.resx +++ b/QtVsTools.Package/Legacy/FormChangeQtVersion.resx @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <root> - <!-- - Microsoft ResX Schema - + <!-- + Microsoft ResX Schema + Version 2.0 - - The primary goals of this format is to allow a simple XML format - that is mostly human readable. The generation and parsing of the - various data types are done through the TypeConverter classes + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes associated with the data types. - + Example: - + ... ado.net/XML headers & schema ... <resheader name="resmimetype">text/microsoft-resx</resheader> <resheader name="version">2.0</resheader> @@ -26,36 +26,36 @@ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> <comment>This is a comment</comment> </data> - - There are any number of "resheader" rows that contain simple + + There are any number of "resheader" rows that contain simple name/value pairs. - - Each data row contains a name, and value. The row also contains a - type or mimetype. Type corresponds to a .NET class that support - text/value conversion through the TypeConverter architecture. - Classes that don't support this are serialized and stored with the + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the mimetype set. - - The mimetype is used for serialized objects, and tells the - ResXResourceReader how to depersist the object. This is currently not + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not extensible. For a given mimetype the value must be set accordingly: - - Note - application/x-microsoft.net.object.binary.base64 is the format - that the ResXResourceWriter will generate, however the reader can + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can read any of the formats listed below. - + mimetype: application/x-microsoft.net.object.binary.base64 - value : The object must be serialized with + value : The object must be serialized with : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. - + mimetype: application/x-microsoft.net.object.soap.base64 - value : The object must be serialized with + value : The object must be serialized with : System.Runtime.Serialization.Formatters.Soap.SoapFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.bytearray.base64 - value : The object must be serialized into a byte array + value : The object must be serialized into a byte array : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> diff --git a/QtVsTools.Package/Package/QtMainMenu.cs b/QtVsTools.Package/Package/QtMainMenu.cs index 6abcbe21..d273afe1 100644 --- a/QtVsTools.Package/Package/QtMainMenu.cs +++ b/QtVsTools.Package/Package/QtMainMenu.cs @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt VS Tools. @@ -170,8 +170,8 @@ namespace QtVsTools case CommandId.ChangeProjectQtVersionId: { var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte); if (HelperFunctions.IsQMakeProject(pro)) { - using (var formChangeQtVersion = new FormChangeQtVersion()) { - formChangeQtVersion.UpdateContent(ChangeFor.Project); + using (var formChangeQtVersion = new Legacy.FormChangeQtVersion()) { + formChangeQtVersion.UpdateContent(Legacy.ChangeFor.Project); var ww = new MainWinWrapper(QtVsToolsPackage.Instance.Dte); if (formChangeQtVersion.ShowDialog(ww) == DialogResult.OK) { var qtVersion = formChangeQtVersion.GetSelectedQtVersion(); diff --git a/QtVsTools.Package/Package/QtProjectContextMenu.cs b/QtVsTools.Package/Package/QtProjectContextMenu.cs index f8f32010..a1cdd8f3 100644 --- a/QtVsTools.Package/Package/QtProjectContextMenu.cs +++ b/QtVsTools.Package/Package/QtProjectContextMenu.cs @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt VS Tools. @@ -156,8 +156,8 @@ namespace QtVsTools case CommandId.ChangeProjectQtVersionProjectId: { var pro = HelperFunctions.GetSelectedQtProject(QtVsToolsPackage.Instance.Dte); if (HelperFunctions.IsQMakeProject(pro)) { - using (var formChangeQtVersion = new FormChangeQtVersion()) { - formChangeQtVersion.UpdateContent(ChangeFor.Project); + using (var formChangeQtVersion = new Legacy.FormChangeQtVersion()) { + formChangeQtVersion.UpdateContent(Legacy.ChangeFor.Project); var ww = new MainWinWrapper(QtVsToolsPackage.Instance.Dte); if (formChangeQtVersion.ShowDialog(ww) == DialogResult.OK) { var qtVersion = formChangeQtVersion.GetSelectedQtVersion(); diff --git a/QtVsTools.Package/Package/QtSolutionContextMenu.cs b/QtVsTools.Package/Package/QtSolutionContextMenu.cs index 0f9a8a73..89a06ef8 100644 --- a/QtVsTools.Package/Package/QtSolutionContextMenu.cs +++ b/QtVsTools.Package/Package/QtSolutionContextMenu.cs @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt VS Tools. @@ -101,7 +101,23 @@ namespace QtVsTools var command = sender as OleMenuCommand; if (command == null) return; - command.Enabled = command.Visible = true; + + switch (command.CommandID.ID) { + case (int)CommandId.ChangeSolutionQtVersionId: + var projects = HelperFunctions.ProjectsInSolution(QtVsToolsPackage.Instance.Dte); + foreach (var project in projects) { + if (!HelperFunctions.IsQtProject(project) + && HelperFunctions.IsQMakeProject(project)) { + command.Enabled = command.Visible = true; + return; + } + } + command.Enabled = command.Visible = false; + break; + default: + command.Enabled = command.Visible = true; + break; + } } private void execHandler(object sender, EventArgs e) @@ -113,17 +129,17 @@ namespace QtVsTools return; var dte = QtVsToolsPackage.Instance.Dte; - switch (command.CommandID.ID) { - case (int)CommandId.lUpdateOnSolutionId: + switch ((CommandId)command.CommandID.ID) { + case CommandId.lUpdateOnSolutionId: Translation.RunlUpdate(QtVsToolsPackage.Instance.Dte.Solution); break; - case (int)CommandId.lReleaseOnSolutionId: + case CommandId.lReleaseOnSolutionId: Translation.RunlRelease(QtVsToolsPackage.Instance.Dte.Solution); break; - case (int)CommandId.ChangeSolutionQtVersionId: + case CommandId.ChangeSolutionQtVersionId: string newQtVersion = null; - using (var formChangeQtVersion = new FormChangeQtVersion()) { - formChangeQtVersion.UpdateContent(ChangeFor.Solution); + using (var formChangeQtVersion = new Legacy.FormChangeQtVersion()) { + formChangeQtVersion.UpdateContent(Legacy.ChangeFor.Solution); if (formChangeQtVersion.ShowDialog() != DialogResult.OK) return; newQtVersion = formChangeQtVersion.GetSelectedQtVersion(); @@ -153,13 +169,12 @@ namespace QtVsTools qtProject.ChangeQtVersion(OldQtVersion, newQtVersion, ref created); } } - QtVersionManager.The().SaveSolutionQtVersion(dte.Solution, newQtVersion); + Core.Legacy.QtVersionManager.SaveSolutionQtVersion(dte.Solution, newQtVersion); break; - case (int)CommandId.SolutionConvertToQtMsBuild: { - QtMsBuildConverter.SolutionToQtMsBuild(); - } + case CommandId.SolutionConvertToQtMsBuild: + QtMsBuildConverter.SolutionToQtMsBuild(); break; - case (int)CommandId.SolutionEnableProjectTracking: { + case CommandId.SolutionEnableProjectTracking: { foreach (var project in HelperFunctions.ProjectsInSolution(dte)) { if (HelperFunctions.IsQtProject(project)) QtProjectTracker.Get(project, project.FullName); diff --git a/QtVsTools.Package/QtVsTools.Package.csproj b/QtVsTools.Package/QtVsTools.Package.csproj index cbb2b746..c5016622 100644 --- a/QtVsTools.Package/QtVsTools.Package.csproj +++ b/QtVsTools.Package/QtVsTools.Package.csproj @@ -332,7 +332,7 @@ <MergeWithCTO>true</MergeWithCTO> <ManifestResourceName>VSPackage</ManifestResourceName> </EmbeddedResource> - <Compile Include="Package\ChangeFor.cs" /> + <Compile Include="Legacy\ChangeFor.cs" /> <Compile Include="Common\Concurrent.cs" /> <Compile Include="Common\ConcurrentStopwatch.cs" /> <Compile Include="Common\Disposable.cs" /> @@ -351,10 +351,10 @@ <Compile Include="Editors\Editor.QtLinguist.cs" /> <Compile Include="Editors\Editor.QtResourceEditor.cs" /> <Compile Include="Package\ExtLoader.cs" /> - <Compile Include="Package\FormChangeQtVersion.cs"> + <Compile Include="Legacy\FormChangeQtVersion.cs"> <SubType>Form</SubType> </Compile> - <Compile Include="Package\FormChangeQtVersion.Designer.cs"> + <Compile Include="Legacy\FormChangeQtVersion.Designer.cs"> <DependentUpon>FormChangeQtVersion.cs</DependentUpon> </Compile> <Compile Include="Package\FormProjectQtSettings.cs"> @@ -512,7 +512,7 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> <IncludeInVSIX>true</IncludeInVSIX> </Content> - <EmbeddedResource Include="Package\FormChangeQtVersion.resx"> + <EmbeddedResource Include="Legacy\FormChangeQtVersion.resx"> <DependentUpon>FormChangeQtVersion.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="Package\FormProjectQtSettings.resx"> diff --git a/QtVsTools.Package/Resources.resx b/QtVsTools.Package/Resources.resx index 81664889..918de924 100644 --- a/QtVsTools.Package/Resources.resx +++ b/QtVsTools.Package/Resources.resx @@ -178,18 +178,12 @@ Converting project {0}/{1}: {2}...</value> <data name="ProjectQtSettingsButtonText" xml:space="preserve"> <value>Qt Project Settings</value> </data> - <data name="ProjectQtVersion" xml:space="preserve"> - <value>Set Project's Qt Version</value> - </data> <data name="ProjectQtVersionNotFoundError" xml:space="preserve"> <value>There's no Qt version assigned to project {0} for configuration {1}/{2}. Please use the 'Qt Project Settings' editor to change the 'Version' to a valid Qt version for this platform.</value> </data> <data name="QtModules" xml:space="preserve"> <value>Qt Modules</value> </data> - <data name="SolutionQtVersion" xml:space="preserve"> - <value>Set Solution's Qt Version</value> - </data> <data name="ExportProject_ImportPriFile" xml:space="preserve"> <value>Import from .pri File</value> </data> |