From ca47896204482bf4a6979e3838bf7f09f61cebeb Mon Sep 17 00:00:00 2001
From: giy <giy@omp-system.ru>
Date: Fri, 02 Sep 2022 14:16:56 +0300
Subject: [PATCH] Обновление до версии 2.9.0
---
QtVsTools.Package/Package/ExtLoader.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/QtVsTools.Package/Package/ExtLoader.cs b/QtVsTools.Package/Package/ExtLoader.cs
index 83885ac..76fc8bf 100644
--- a/QtVsTools.Package/Package/ExtLoader.cs
+++ b/QtVsTools.Package/Package/ExtLoader.cs
@@ -26,22 +26,27 @@
**
****************************************************************************/
-using Microsoft.VisualStudio.VCProjectEngine;
-using QtVsTools.Core;
using System.Collections.Generic;
using System.IO;
using System.Text.RegularExpressions;
using System.Windows.Forms;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.VCProjectEngine;
namespace QtVsTools
{
+ using Core;
+
public static class ExtLoader
{
public static void ImportProFile()
{
+ ThreadHelper.ThrowIfNotOnUIThread();
+
var vm = QtVersionManager.The();
var qtVersion = vm.GetDefaultVersion();
var qtDir = vm.GetInstallPath(qtVersion);
+
if (qtDir == null) {
Messages.DisplayErrorMessage(SR.GetString("CannotFindQMake"));
return;
@@ -59,11 +64,13 @@
public static void ImportPriFile(EnvDTE.Project project)
{
+ ThreadHelper.ThrowIfNotOnUIThread();
+
if (project == null)
return;
VCProject vcproj;
- if (!HelperFunctions.IsQtProject(project))
+ if (!HelperFunctions.IsVsToolsProject(project))
return;
vcproj = project.Object as VCProject;
@@ -87,10 +94,12 @@
public static void ImportPriFile(EnvDTE.Project project, string fileName)
{
+ ThreadHelper.ThrowIfNotOnUIThread();
+
if (project == null)
return;
- if (!HelperFunctions.IsQtProject(project))
+ if (!HelperFunctions.IsVsToolsProject(project))
return;
var vcproj = project.Object as VCProject;
@@ -134,6 +143,8 @@
private static List<string> ResolveFilesFromQMake(string[] files, EnvDTE.Project project, string path)
{
+ ThreadHelper.ThrowIfNotOnUIThread();
+
var lst = new List<string>();
foreach (var file in files) {
var s = ResolveEnvironmentVariables(file, project);
--
Gitblit v1.9.1