mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-10 22:18:54 +01:00
Merge pull request #5487
270f42d [Qt] fix a <Qt4.7 compatibility issue raised in #5228 (Jonas Schnelli)
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user