Skip to content

Commit e52ce9f

Browse files
committed
Merge #21286: build: Bump minimum Qt version to 5.9.5
faa06ec build: Bump minimum Qt version to 5.9.5 (Hennadii Stepanov) Pull request description: Close #20104. ACKs for top commit: laanwj: Code review ACK faa06ec jarolrod: ACK faa06ec fanquake: ACK faa06ec - this should be ok to do now. Tree-SHA512: 7295472b5fd37ffb30f044e88c39d375a5a5187d3f2d44d4e73d0eb0c7fd923cf9949c2ddab6cddd8c5da7e375fff38112b6ea9779da4fecce6f024d05ba9c08
2 parents fb67cae + faa06ec commit e52ce9f

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ else
12831283
BITCOIN_QT_INIT
12841284

12851285
dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
1286-
BITCOIN_QT_CONFIGURE([5.5.1])
1286+
BITCOIN_QT_CONFIGURE([5.9.5])
12871287

12881288
dnl Keep a copy of the original $QT_INCLUDES and use it when invoking qt's moc
12891289
QT_INCLUDES_UNSUPPRESSED=$QT_INCLUDES

doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
2121
| PCRE | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) |
2222
| Python (tests) | | [3.6](https://www.python.org/downloads) | | | |
2323
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
24-
| Qt | [5.9.8](https://download.qt.io/official_releases/qt/) | [5.5.1](https://github.com/bitcoin/bitcoin/issues/13478) | No | | |
24+
| Qt | [5.9.8](https://download.qt.io/official_releases/qt/) | [5.9.5](https://github.com/bitcoin/bitcoin/issues/20104) | No | | |
2525
| SQLite | [3.32.1](https://sqlite.org/download.html) | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) | | | |
2626
| XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) (Linux only) |
2727
| xkbcommon | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) (Linux only) |

src/qt/bitcoin.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,9 +464,7 @@ int GuiMain(int argc, char* argv[])
464464

465465
// Generate high-dpi pixmaps
466466
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
467-
#if QT_VERSION >= 0x050600
468467
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
469-
#endif
470468

471469
#if (QT_VERSION <= QT_VERSION_CHECK(5, 9, 8)) && defined(Q_OS_MACOS)
472470
const auto os_name = QSysInfo::prettyProductName();

0 commit comments

Comments
 (0)