diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-05-31 14:02:24 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-06-01 11:05:08 +0200 |
| commit | 25c0cce7fb494fcb871d134e28b26504d30e34d3 (patch) | |
| tree | c6fb9d0daa4675999cfa57d4f3668e2990dc9368 /src/qt/splashscreen.cpp | |
| parent | 365ab225c082277076debeb68ddd75e73f71ac26 (diff) | |
Qt5 compatibility
This commit squashes all the changes in the Qt5 branch
relative to master.
Backward compatibility with Qt4 is retained.
Original authors:
- Philip Kaufmann <phil.kaufmann@t-online.de>
- Jonas Schnelli <jonas.schnelli@include7.ch>
Diffstat (limited to 'src/qt/splashscreen.cpp')
| -rw-r--r-- | src/qt/splashscreen.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index f8d16699ca..95948a6cbd 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -3,6 +3,7 @@ #include "util.h" #include <QPainter> +#undef loop /* ugh, remove this when the #define loop is gone from util.h */ #include <QApplication> SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) : |