highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-03 00:10:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5487

Browse Source 
270f42d [Qt] fix a <Qt4.7 compatibility issue raised in #5228 (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan 2014-12-16 13:27:38 +01:00
commit 28a274e6ce
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/networkstyle.cpp
View File

@ -68,7 +68,11 @@ NetworkStyle::NetworkStyle(const QString &appName, const int iconColorHueShift,
}
//convert back to QPixmap
#if QT_VERSION >= 0x040700
pixmap.convertFromImage(img);
#else
pixmap = QPixmap::fromImage(img);
#endif
}
appIcon = QIcon(pixmap);