[Qt] fix a <Qt4.7 compatibility issue raised in #5228
This commit is contained in:
parent
73cbf0a527
commit
270f42d39f
1 changed files with 4 additions and 0 deletions
|
@ -68,7 +68,11 @@ NetworkStyle::NetworkStyle(const QString &appName, const int iconColorHueShift,
|
||||||
}
|
}
|
||||||
|
|
||||||
//convert back to QPixmap
|
//convert back to QPixmap
|
||||||
|
#if QT_VERSION >= 0x040700
|
||||||
pixmap.convertFromImage(img);
|
pixmap.convertFromImage(img);
|
||||||
|
#else
|
||||||
|
pixmap = QPixmap::fromImage(img);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
appIcon = QIcon(pixmap);
|
appIcon = QIcon(pixmap);
|
||||||
|
|
Loading…
Reference in a new issue