diff options
| author | miniak <milan.burda@gmail.com> | 2009-07-01 09:50:23 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:51:23 (GMT) |
| commit | 5ea86cfac34f65b2321ceeeb651e4e7099bf59a0 (patch) | |
| tree | 22b8a82d8ea31ad1df0d8806394d03e23079c5fa /tools/linguist/shared/profileevaluator.cpp | |
| parent | 24e7a5f983ead3fe722703851cf59cd0943e3964 (diff) | |
| download | Qt-5ea86cfac34f65b2321ceeeb651e4e7099bf59a0.zip Qt-5ea86cfac34f65b2321ceeeb651e4e7099bf59a0.tar.gz Qt-5ea86cfac34f65b2321ceeeb651e4e7099bf59a0.tar.bz2 | |
tools: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support
Also QString::fromUtf16() -> QString::fromWCharArray()
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
Diffstat (limited to 'tools/linguist/shared/profileevaluator.cpp')
| -rw-r--r-- | tools/linguist/shared/profileevaluator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index ef59543..47c1ec2 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -1949,9 +1949,9 @@ QStringList ProFileEvaluator::Private::values(const QString &variableName, ret = QLatin1String("Windows"); } else if (type == QLatin1String("name")) { DWORD name_length = 1024; - TCHAR name[1024]; + wchar_t name[1024]; if (GetComputerName(name, &name_length)) - ret = QString::fromUtf16((ushort*)name, name_length); + ret = QString::fromWCharArray(name); } else if (type == QLatin1String("version") || type == QLatin1String("version_string")) { QSysInfo::WinVersion ver = QSysInfo::WindowsVersion; if (type == QLatin1String("version")) |