Browse Source

Merge pull request #5487

270f42d [Qt] fix a <Qt4.7 compatibility issue raised in #5228 (Jonas Schnelli)
pull/1/head
Wladimir J. van der Laan 8 years ago
parent
commit
28a274e6ce
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 4
      src/qt/networkstyle.cpp

4
src/qt/networkstyle.cpp

@ -68,7 +68,11 @@ NetworkStyle::NetworkStyle(const QString &appName, const int iconColorHueShift, @@ -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);

Loading…
Cancel
Save