diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-02-20 12:28:52 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-02-21 07:02:34 +0000 |
| commit | 296f7709bd2f829fdb17ca3e848b1725416a8986 (patch) | |
| tree | 30bbb3f32ee252928105b36f86c23e28aad09796 /src/plugins/cpptools/cppfilesettingspage.cpp | |
| parent | 434c9602430b0b8eef2793d1b5c927bad443bf48 (diff) | |
| download | qt-creator-296f7709bd2f829fdb17ca3e848b1725416a8986.tar.gz | |
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>
Diffstat (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppfilesettingspage.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 5ff64b165d..187f5d5913 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%'). |