From 296f7709bd2f829fdb17ca3e848b1725416a8986 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Wed, 20 Feb 2019 12:28:52 +0100
Subject: [PATCH] LicenseTemplate: Fix %USER% on Windows

Fixes: QTCREATORBUG-21871
Change-Id: Ibec147b32cc3bd1053e5df07b27838094dc02e88
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/cpptools/cppfilesettingspage.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 5ff64b165da..187f5d5913e 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -37,6 +37,7 @@
 
 #include <utils/environment.h>
 #include <utils/fileutils.h>
+#include <utils/hostosinfo.h>
 #include <utils/mimetypes/mimedatabase.h>
 
 #include <QSettings>
@@ -173,7 +174,8 @@ static bool keyWordReplacement(const QString &keyWord,
         return true;
     }
     if (keyWord == QLatin1String("%USER%")) {
-        *value = QLatin1String("%{Env:USER}");
+        *value = Utils::HostOsInfo::isWindowsHost() ? QLatin1String("%{Env:USERNAME}")
+                                                    : QLatin1String("%{Env:USER}");
         return true;
     }
     // Environment variables (for example '%$EMAIL%').