Fix setting project keywork during conversion

Fixed a problem where the wrong project keyword tag was overwritten with
the Qt VS project format version, when more than one keyword tag was
present in the original project. Depending on the order of the tags,
the resulting project would contain two keyword tags with different
project format versions.

Task-number: QTVSADDINBUG-702
Change-Id: I343e85a17b9f14971ca414fc57542243021549e2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/qtprojectlib/MsBuildProject.cs b/src/qtprojectlib/MsBuildProject.cs
index 8f3ebf03..8e50b74e 100644
--- a/src/qtprojectlib/MsBuildProject.cs
+++ b/src/qtprojectlib/MsBuildProject.cs
@@ -309,7 +309,11 @@ namespace QtProjectLib
                 .ToDictionary(pg => (string)pg.Attribute("Condition"));
 
             // Set Qt project format version
-            var projKeyword = globals.Element(ns + "Keyword");
+            var projKeyword = globals
+                .Elements(ns + "Keyword")
+                .Where(x => x.Value.StartsWith(Resources.qtProjectKeyword)
+                    || x.Value.StartsWith(Resources.qtProjectV2Keyword))
+                .FirstOrDefault();
             if (projKeyword == null)
                 return false;
             var oldVersion = ParseProjectFormatVersion(projKeyword.Value);