diff options
| author | Jonas Schnelli <[email protected]> | 2014-12-16 12:59:36 +0100 |
|---|---|---|
| committer | Jonas Schnelli <[email protected]> | 2014-12-16 13:21:36 +0100 |
| commit | 270f42d39f84f17d8f0e8f6c747b66cba880f2e2 (patch) | |
| tree | 6587361abbe83041658d309a1a4ce7b9ed91478c /src/qt/networkstyle.cpp | |
| parent | Merge pull request #5258 (diff) | |
| download | discoin-270f42d39f84f17d8f0e8f6c747b66cba880f2e2.tar.xz discoin-270f42d39f84f17d8f0e8f6c747b66cba880f2e2.zip | |
[Qt] fix a <Qt4.7 compatibility issue raised in #5228
Diffstat (limited to 'src/qt/networkstyle.cpp')
| -rw-r--r-- | src/qt/networkstyle.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qt/networkstyle.cpp b/src/qt/networkstyle.cpp index ff05174fb..a1a067dd7 100644 --- a/src/qt/networkstyle.cpp +++ b/src/qt/networkstyle.cpp @@ -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); |