diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-16 13:27:38 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-12-16 13:27:56 +0100 |
| commit | 28a274e6ce5f0326e3c86de810eb6f4a91c8f13c (patch) | |
| tree | 6587361abbe83041658d309a1a4ce7b9ed91478c /src/qt | |
| parent | 73cbf0a5273fa18cc0fbda203913819f9ebe4141 (diff) | |
| parent | 270f42d39f84f17d8f0e8f6c747b66cba880f2e2 (diff) | |
Merge pull request #5487
270f42d [Qt] fix a <Qt4.7 compatibility issue raised in #5228 (Jonas Schnelli)
Diffstat (limited to 'src/qt')
| -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 ff05174fb4..a1a067dd77 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); |