Skip to content

Commit 956f732

Browse files
committed
build: Bump minimum Qt version to 5.11.3
1 parent e22d10b commit 956f732

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ else
12891289
BITCOIN_QT_INIT
12901290

12911291
dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
1292-
BITCOIN_QT_CONFIGURE([5.9.5])
1292+
BITCOIN_QT_CONFIGURE([5.11.3])
12931293

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

doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
2020
| PCRE | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) |
2121
| Python (tests) | | [3.6](https://www.python.org/downloads) | | | |
2222
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
23-
| Qt | [5.15.2](https://download.qt.io/official_releases/qt/) | [5.9.5](https://github.com/bitcoin/bitcoin/issues/20104) | No | | |
23+
| Qt | [5.15.2](https://download.qt.io/official_releases/qt/) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No | | |
2424
| SQLite | [3.32.1](https://sqlite.org/download.html) | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) | | | |
2525
| XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk) (Linux only) |
2626
| systemtap ([tracing](tracing.md))| [4.5](https://sourceware.org/systemtap/ftp/releases/) | | | | |

src/qt/guiutil.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -888,11 +888,7 @@ void PolishProgressDialog(QProgressDialog* dialog)
888888

889889
int TextWidth(const QFontMetrics& fm, const QString& text)
890890
{
891-
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
892891
return fm.horizontalAdvance(text);
893-
#else
894-
return fm.width(text);
895-
#endif
896892
}
897893

898894
void LogQtInfo()

0 commit comments

Comments
 (0)