diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2013-06-23 04:40:00 +0400 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2013-06-29 18:56:41 +0400 |
| commit | 7e452dc3c34a53a34624f5b6a9445cce81166e6f (patch) | |
| tree | fb93307667d3112bf1e32038c9629f1a61752e6b /src/mumble/OverlayConfig.cpp | |
| parent | 5cb337049b42f5caa500328fe77724525ea4c6f7 (diff) | |
mumble, murmur: Qt 5 support for Windows.
Diffstat (limited to 'src/mumble/OverlayConfig.cpp')
| -rw-r--r-- | src/mumble/OverlayConfig.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mumble/OverlayConfig.cpp b/src/mumble/OverlayConfig.cpp index 9a45da3f6..cf9853cf8 100644 --- a/src/mumble/OverlayConfig.cpp +++ b/src/mumble/OverlayConfig.cpp @@ -218,7 +218,12 @@ OverlayAppInfo OverlayConfig::applicationInfoForId(const QString &identifier) { #elif defined(Q_OS_WIN) HICON icon = ExtractIcon(qWinAppInst(), identifier.toStdWString().c_str(), 0); if (icon) { +#if QT_VERSION >= 0x050000 + extern QPixmap qt_pixmapFromWinHICON(HICON icon); + qiAppIcon = QIcon(qt_pixmapFromWinHICON(icon)); +#else qiAppIcon = QIcon(QPixmap::fromWinHICON(icon)); +#endif DestroyIcon(icon); } #endif |