diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2022-12-01 16:49:43 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2022-12-16 12:38:00 +0000 |
| commit | 62596f3f7279ef8db3ac2e258cfbee86a14273d7 (patch) | |
| tree | 53aeb09bd019efb6429628bb9b8ed71d5d877cb6 | |
| parent | 43e5fdc5bc9f65ccafbe8a364abecb8dd2196c04 (diff) | |
Fix broken output in Qt version checks
Change-Id: I2d0679269d9a0c9c90f70829e0c29d2ad585044b
Reviewed-by: Miguel Costa <miguel.costa@qt.io>
| -rw-r--r-- | QtVsTools.Core/QtVersionManager.cs | 13 | ||||
| -rw-r--r-- | QtVsTools.Package/Options/QtVersionsPage.cs | 6 |
2 files changed, 11 insertions, 8 deletions
diff --git a/QtVsTools.Core/QtVersionManager.cs b/QtVsTools.Core/QtVersionManager.cs index eb398216..ba067e23 100644 --- a/QtVsTools.Core/QtVersionManager.cs +++ b/QtVsTools.Core/QtVersionManager.cs @@ -149,16 +149,17 @@ namespace QtVsTools.Core continue; if (string.IsNullOrEmpty(path) || !QMake.Exists(path)) { - errorMessage += version + " in " + path + "\n"; + errorMessage += $" * {version} in {path}\n"; defaultVersionInvalid |= version == defaultVersion; } + } - if (!string.IsNullOrEmpty(errorMessage)) { - errorMessage = "These Qt version are inaccessible:\n" - + errorMessage - + "Make sure that you have read access to all files in your Qt directories."; - } + if (!string.IsNullOrEmpty(errorMessage)) { + errorMessage = "These Qt version are inaccessible:\n" + + errorMessage + + "Make sure that you have read access to all files in your Qt directories."; } + return errorMessage != null; } diff --git a/QtVsTools.Package/Options/QtVersionsPage.cs b/QtVsTools.Package/Options/QtVersionsPage.cs index 7eb98fd6..80754de2 100644 --- a/QtVsTools.Package/Options/QtVersionsPage.cs +++ b/QtVsTools.Package/Options/QtVersionsPage.cs @@ -170,8 +170,10 @@ namespace QtVsTools.Options QMakeConf qtConfiguration = new QMakeConf(versionPath); var generator = qtConfiguration.Entries["MAKEFILE_GENERATOR"].ToString(); - if (generator != "MSVC.NET" && generator != "MSBUILD") - errorMessages.Add($"Unsupported makefile generator used: {generator}"); + if (generator != "MSVC.NET" && generator != "MSBUILD") { + errorMessages.Add($"{version.VersionName} - Unsupported makefile " + + $"generator: {generator}"); + } } } } catch (Exception exception) { |