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/qrcodedialog.cpp | |
| parent | 365ab225c082277076debeb68ddd75e73f71ac26 (diff) | |
| download | bitcoin-25c0cce7fb494fcb871d134e28b26504d30e34d3.tar.xz | |
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/qrcodedialog.cpp')
| -rw-r--r-- | src/qt/qrcodedialog.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qt/qrcodedialog.cpp b/src/qt/qrcodedialog.cpp index ca94975128..6ddcaaf5d9 100644 --- a/src/qt/qrcodedialog.cpp +++ b/src/qt/qrcodedialog.cpp @@ -7,7 +7,9 @@ #include "optionsmodel.h" #include <QPixmap> +#if QT_VERSION < 0x050000 #include <QUrl> +#endif #include <qrencode.h> |