diff options
| author | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2010-11-17 21:38:56 +0300 |
|---|---|---|
| committer | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2011-05-14 11:47:39 +0400 |
| commit | fa7ea52595ff2755e2f556c379e886c6413cc69a (patch) | |
| tree | 03d7a036e60db42676cd8f7c2bc5f39b45cccba2 /src/mumble/OverlayConfig.cpp | |
| parent | 43152147ec9c1845965acf280c1b59baa9bbebeb (diff) | |
Fixes for /Zc:wchar_t
/Zc:Wchar_t changes wchar_t to a native type which is
incompatible with short.
Diffstat (limited to 'src/mumble/OverlayConfig.cpp')
| -rw-r--r-- | src/mumble/OverlayConfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mumble/OverlayConfig.cpp b/src/mumble/OverlayConfig.cpp index 1b2eb8594..ba088b4fa 100644 --- a/src/mumble/OverlayConfig.cpp +++ b/src/mumble/OverlayConfig.cpp @@ -215,7 +215,7 @@ OverlayAppInfo OverlayConfig::applicationInfoForId(const QString &identifier) { CFRelease(bundle); #elif defined(Q_OS_WIN) - HICON icon = ExtractIcon(qWinAppInst(), identifier.utf16(), 0); + HICON icon = ExtractIcon(qWinAppInst(), identifier.toStdWString().c_str(), 0); if (icon) { qiAppIcon = QIcon(QPixmap::fromWinHICON(icon)); DestroyIcon(icon); |