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/bitcoin.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/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index f525d1bb38..354c5af453 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -17,7 +17,9 @@ #include "splashscreen.h" #include <QMessageBox> +#if QT_VERSION < 0x050000 #include <QTextCodec> +#endif #include <QLocale> #include <QTimer> #include <QTranslator> @@ -118,9 +120,11 @@ int main(int argc, char *argv[]) // Command-line options take precedence: ParseParameters(argc, argv); +#if QT_VERSION < 0x050000 // Internal string conversion is all UTF-8 QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8")); QTextCodec::setCodecForCStrings(QTextCodec::codecForTr()); +#endif Q_INIT_RESOURCE(bitcoin); QApplication app(argc, argv); |