diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-06-20 13:31:17 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-06-20 13:33:41 +0200 |
| commit | 12a541e8dae0a37bbb13fbe171d959eb8a0ed118 (patch) | |
| tree | 287851c8f7c5dd2a544c197e8c1e06f12aa8e1ae /src | |
| parent | 377d1310acc76052229ea5b007d3f049f7bcc0a4 (diff) | |
| parent | 2759597bc8617039a7ffa6210f4d49a985a20093 (diff) | |
| download | bitcoin-12a541e8dae0a37bbb13fbe171d959eb8a0ed118.tar.xz | |
Merge #8210: [Qt] Bump to Qt5.6.1
2759597 Only pass -lQt5PlatformSupport if >=Qt5.6 (Jonas Schnelli)
59d063d Use runtime linking of QT libdbus, use custom/temp. SDK URL (Jonas Schnelli)
6194d9a Fix bitcoin_qt.m4 and fix-xcb-include-order.patch (Jonas Schnelli)
f6eb4e2 [depends] OpenSSL 1.0.1k - update config_opts (fanquake)
f25209a depends: bump OSX toolchain (Cory Fields)
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 6218ab6ab0..64b5c83d72 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -533,6 +533,9 @@ int main(int argc, char *argv[]) // Generate high-dpi pixmaps QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); #endif +#if QT_VERSION >= 0x050600 + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#endif #ifdef Q_OS_MAC QApplication::setAttribute(Qt::AA_DontShowIconsInMenus); #endif |