File tree Expand file tree Collapse file tree 3 files changed +2
-6
lines changed Expand file tree Collapse file tree 3 files changed +2
-6
lines changed Original file line number Diff line number Diff line change @@ -1289,7 +1289,7 @@ else
1289
1289
BITCOIN_QT_INIT
1290
1290
1291
1291
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 ] )
1293
1293
1294
1294
dnl Keep a copy of the original $QT_INCLUDES and use it when invoking qt's moc
1295
1295
QT_INCLUDES_UNSUPPRESSED=$QT_INCLUDES
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
20
20
| PCRE | | | | | [ Yes] ( https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk ) |
21
21
| Python (tests) | | [ 3.6] ( https://www.python.org/downloads ) | | | |
22
22
| 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 | | |
24
24
| SQLite | [ 3.32.1] ( https://sqlite.org/download.html ) | [ 3.7.17] ( https://github.com/bitcoin/bitcoin/pull/19077 ) | | | |
25
25
| XCB | | | | | [ Yes] ( https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk ) (Linux only) |
26
26
| systemtap ([ tracing] ( tracing.md ) )| [ 4.5] ( https://sourceware.org/systemtap/ftp/releases/ ) | | | | |
Original file line number Diff line number Diff line change @@ -888,11 +888,7 @@ void PolishProgressDialog(QProgressDialog* dialog)
888
888
889
889
int TextWidth (const QFontMetrics& fm, const QString& text)
890
890
{
891
- #if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
892
891
return fm.horizontalAdvance (text);
893
- #else
894
- return fm.width (text);
895
- #endif
896
892
}
897
893
898
894
void LogQtInfo ()
You can’t perform that action at this time.
0 commit comments