diff options
| author | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:50:26 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius@trolltech.com> | 2009-07-01 09:51:24 (GMT) |
| commit | c447ce31632e25fdd40404cc96b6980aa0adcef8 (patch) | |
| tree | e8ce13c7a83466e8027bae85e3a4e6f67a949623 /qmake/project.cpp | |
| parent | 5ea86cfac34f65b2321ceeeb651e4e7099bf59a0 (diff) | |
| download | Qt-c447ce31632e25fdd40404cc96b6980aa0adcef8.zip Qt-c447ce31632e25fdd40404cc96b6980aa0adcef8.tar.gz Qt-c447ce31632e25fdd40404cc96b6980aa0adcef8.tar.bz2 | |
qmake: 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 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 047a5e3..704d8a6 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -3117,9 +3117,9 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList ret = "Windows"; } else if(type == "name") { DWORD name_length = 1024; - TCHAR name[1024]; - if(GetComputerName(name, &name_length)) - ret = QString::fromUtf16((ushort*)name, name_length); + wchar_t name[1024]; + if (GetComputerName(name, &name_length)) + ret = QString::fromWCharArray(name); } else if(type == "version" || type == "version_string") { QSysInfo::WinVersion ver = QSysInfo::WindowsVersion; if(type == "version") |