diff options
| author | Wladimir J. van der Laan <[email protected]> | 2018-11-14 13:13:13 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2018-11-14 13:13:28 +0100 |
| commit | 74213fa4d13e53c3811d69a516fc865b79fdd0c7 (patch) | |
| tree | 3b79f5b23689e6b4ab0abb30534ee0b047af3086 /src | |
| parent | Merge #14698: build: Add bitcoin-tx.exe into Windows installer (diff) | |
| parent | Bump the minimum Qt version to 5.2 (diff) | |
| download | discoin-74213fa4d13e53c3811d69a516fc865b79fdd0c7.tar.xz discoin-74213fa4d13e53c3811d69a516fc865b79fdd0c7.zip | |
Merge #14725: qt: Bump the minimum Qt version to 5.2
2bc3f114d09a9798d166896b0145b69c5ed2d41e Bump the minimum Qt version to 5.2 (Hennadii Stepanov)
Pull request description:
Refs:
- #13478
- https://github.com/bitcoin/bitcoin/issues/13478#issuecomment-438431556 by @MarcoFalke
Tree-SHA512: b598a80f25df9c440e0776b373b88a305250582049ab60caee48375f6599c2f6d40ed94b488ff3604ec9fc12c71f440f6881a3fc656c81f99e89dc5bf9ea2f6d
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 | ||||
| -rw-r--r-- | src/qt/guiutil.cpp | 12 | ||||
| -rw-r--r-- | src/qt/splashscreen.cpp | 4 |
3 files changed, 1 insertions, 17 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 7508f596e..de236a016 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -570,10 +570,8 @@ int main(int argc, char *argv[]) Q_INIT_RESOURCE(bitcoin_locale); BitcoinApplication app(*node, argc, argv); -#if QT_VERSION > 0x050100 // Generate high-dpi pixmaps QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); -#endif #if QT_VERSION >= 0x050600 QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #endif diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index b1cd2f77d..0e9aca21b 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -47,6 +47,7 @@ #include <QDoubleValidator> #include <QFileDialog> #include <QFont> +#include <QFontDatabase> #include <QKeyEvent> #include <QLineEdit> #include <QSettings> @@ -55,11 +56,6 @@ #include <QUrlQuery> #include <QMouseEvent> - -#if QT_VERSION >= 0x50200 -#include <QFontDatabase> -#endif - #if defined(Q_OS_MAC) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" @@ -82,13 +78,7 @@ QString dateTimeStr(qint64 nTime) QFont fixedPitchFont() { -#if QT_VERSION >= 0x50200 return QFontDatabase::systemFont(QFontDatabase::FixedFont); -#else - QFont font("Monospace"); - font.setStyleHint(QFont::Monospace); - return font; -#endif } // Just some dummy data to generate a convincing random-looking (but consistent) address diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp index b6235e91f..df38285d0 100644 --- a/src/qt/splashscreen.cpp +++ b/src/qt/splashscreen.cpp @@ -37,9 +37,7 @@ SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const Netw float fontFactor = 1.0; float devicePixelRatio = 1.0; -#if QT_VERSION > 0x050100 devicePixelRatio = static_cast<QGuiApplication*>(QCoreApplication::instance())->devicePixelRatio(); -#endif // define text to place QString titleText = tr(PACKAGE_NAME); @@ -53,10 +51,8 @@ SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const Netw QSize splashSize(480*devicePixelRatio,320*devicePixelRatio); pixmap = QPixmap(splashSize); -#if QT_VERSION > 0x050100 // change to HiDPI if it makes sense pixmap.setDevicePixelRatio(devicePixelRatio); -#endif QPainter pixPaint(&pixmap); pixPaint.setPen(QColor(100,100,100)); |