diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2023-03-01 14:19:19 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2023-03-15 13:21:09 +0000 |
| commit | 99b4e1bac6f242a08be6713b2bc70499fa5e8f5d (patch) | |
| tree | 669e3a9eda20743b4285f570011814d6bbb6ca2e | |
| parent | e53b7e0581cb88223d1c373cedc96b8371c89c08 (diff) | |
Remove method QtProject::GetQtVersion()
Change-Id: Ia0601a66ad327d35a13df2ce5320ce05a96a4795
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
| -rw-r--r-- | QtVsTools.Core/QtProject.cs | 9 | ||||
| -rw-r--r-- | QtVsTools.Package/Package/DteEventsHandler.cs | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/QtVsTools.Core/QtProject.cs b/QtVsTools.Core/QtProject.cs index 3a37f5d1..a70a4a2d 100644 --- a/QtVsTools.Core/QtProject.cs +++ b/QtVsTools.Core/QtProject.cs @@ -1073,15 +1073,6 @@ namespace QtVsTools.Core linker.AdditionalOptions = linkerOptions; } - /// <summary> - /// Gets the Qt version of the project - /// </summary> - public string GetQtVersion() - { - ThreadHelper.ThrowIfNotOnUIThread(); - return QtVersionManager.The().GetProjectQtVersion(envPro); - } - public class CppConfig { public VCConfiguration Config; diff --git a/QtVsTools.Package/Package/DteEventsHandler.cs b/QtVsTools.Package/Package/DteEventsHandler.cs index 8eedde53..4754583c 100644 --- a/QtVsTools.Package/Package/DteEventsHandler.cs +++ b/QtVsTools.Package/Package/DteEventsHandler.cs @@ -106,11 +106,10 @@ namespace QtVsTools if (HelperFunctions.GetSelectedQtProject(dte) is not { } project) return; - if (QtProject.Create(project) is {} qtProject) { - var versionInfo = QtVersionManager.The().GetVersionInfo(qtProject.GetQtVersion()); - if (!string.IsNullOrEmpty(versionInfo?.Namespace())) - QtVsToolsPackage.Instance.CopyVisualizersFiles(versionInfo.Namespace()); - } + var version = QtVersionManager.The().GetProjectQtVersion(project); + var versionInfo = QtVersionManager.The().GetVersionInfo(version); + if (!string.IsNullOrEmpty(versionInfo?.Namespace())) + QtVsToolsPackage.Instance.CopyVisualizersFiles(versionInfo.Namespace()); // Notify about old project format and offer upgrade option. if (QtProject.GetFormatVersion(project) >= Resources.qtMinFormatVersion_Settings) |